diff options
| author | Simon Horman <horms@verge.net.au> | 2008-09-17 04:10:41 +0400 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-09-17 04:10:41 +0400 |
| commit | 9e691ed68d94ab3047e028736641445b4cf74d67 (patch) | |
| tree | 165104bf7462da9e61263441458795da32b6c820 | |
| parent | e8ae43ec6d8fb28ceeb3eb2b9aa2de823666ba2b (diff) | |
| download | linux-9e691ed68d94ab3047e028736641445b4cf74d67.tar.xz | |
ipvs: only unlock in ip_vs_edit_service() if already locked
Jumping to out unlocks __ip_vs_svc_lock, but that lock is not taken until
after code that may jump to out.
This problem was detected by sparse.
make C=1
CHECK net/ipv4/ipvs/ip_vs_ctl.c
net/ipv4/ipvs/ip_vs_ctl.c:1332:2: warning: context imbalance in 'ip_vs_edit_service' - unexpected unlock
Acked-by: Sven Wegener <sven.wegener@stealer.net>
Acked-by: Julius Volz <juliusv@google.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_ctl.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c index 993a83fb0d56..60ca24b9ec00 100644 --- a/net/ipv4/ipvs/ip_vs_ctl.c +++ b/net/ipv4/ipvs/ip_vs_ctl.c @@ -1305,7 +1305,7 @@ ip_vs_edit_service(struct ip_vs_service *svc, struct ip_vs_service_user_kern *u) */ if ((ret = ip_vs_unbind_scheduler(svc))) { old_sched = sched; - goto out; + goto out_unlock; } /* @@ -1324,12 +1324,13 @@ ip_vs_edit_service(struct ip_vs_service *svc, struct ip_vs_service_user_kern *u) */ ip_vs_bind_scheduler(svc, old_sched); old_sched = sched; - goto out; + goto out_unlock; } } - out: + out_unlock: write_unlock_bh(&__ip_vs_svc_lock); + out: if (old_sched) ip_vs_scheduler_put(old_sched); |