diff options
| author | Julian Anastasov <ja@ssi.bg> | 2011-02-22 10:40:25 +0200 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2011-03-02 07:54:41 +0900 |
| commit | ff75f40f44ae9b79d520bf32a05d35af74a805c0 (patch) | |
| tree | ec3dc42c3a95c5482569956b9be4503ef0e46259 | |
| parent | 0af320fb4627033e49cbc6e8138e7aa75ab8352a (diff) | |
| download | linux-ff75f40f44ae9b79d520bf32a05d35af74a805c0.tar.gz linux-ff75f40f44ae9b79d520bf32a05d35af74a805c0.tar.bz2 linux-ff75f40f44ae9b79d520bf32a05d35af74a805c0.zip | |
ipvs: fix dst_lock locking on dest update
Fix dst_lock usage in __ip_vs_update_dest. We need
_bh locking because destination is updated in user context.
Can cause lockups on frequent destination updates.
Problem reported by Simon Kirby. Bug was introduced
in 2.6.37 from the "ipvs: changes for local real server"
change.
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Hans Schillstrom <hans@schillstrom.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 22f7ad5101ab..ba98e1308f3c 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -808,9 +808,9 @@ __ip_vs_update_dest(struct ip_vs_service *svc, struct ip_vs_dest *dest, dest->u_threshold = udest->u_threshold; dest->l_threshold = udest->l_threshold; - spin_lock(&dest->dst_lock); + spin_lock_bh(&dest->dst_lock); ip_vs_dst_reset(dest); - spin_unlock(&dest->dst_lock); + spin_unlock_bh(&dest->dst_lock); if (add) ip_vs_new_estimator(&dest->stats); |