git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
cfg80211: fix netns error unwinding bug
[safe/jmp/linux-2.6]
/
net
/
wireless
/
nl80211.c
diff --git
a/net/wireless/nl80211.c
b/net/wireless/nl80211.c
index
eddab09
..
ca3c92a
100644
(file)
--- 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;
}