diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2009-10-08 21:02:02 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-10-08 16:27:00 -0400 |
| commit | 8a8e05e5d8f6155788761961fc9845328863c16d (patch) | |
| tree | fc842a395135d7840b440d656cf31f0a7b1548f3 | |
| parent | 7e937c633f718e0916a294db7282c922c1bf3ce3 (diff) | |
| download | linux-8a8e05e5d8f6155788761961fc9845328863c16d.tar.gz linux-8a8e05e5d8f6155788761961fc9845328863c16d.tar.bz2 linux-8a8e05e5d8f6155788761961fc9845328863c16d.zip | |
cfg80211: fix netns error unwinding bug
The error unwinding code in set_netns has a bug
that will make it run into a BUG_ON if passed a
bad wiphy index, fix by not trying to unlock a
wiphy that doesn't exist.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/wireless/nl80211.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index eddab097435c..ca3c92a0a14f 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -4029,7 +4029,7 @@ static int nl80211_wiphy_netns(struct sk_buff *skb, struct genl_info *info) rdev = cfg80211_get_dev_from_info(info); if (IS_ERR(rdev)) { err = PTR_ERR(rdev); - goto out; + goto out_rtnl; } net = get_net_ns_by_pid(pid); @@ -4049,6 +4049,7 @@ static int nl80211_wiphy_netns(struct sk_buff *skb, struct genl_info *info) put_net(net); out: cfg80211_unlock_rdev(rdev); + out_rtnl: rtnl_unlock(); return err; } |