diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-06-11 16:51:03 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-06-11 16:52:39 +0200 |
| commit | 940d0ac9dbe3fb9d4806e96f006286c2e476deed (patch) | |
| tree | 3fea9c0940ebc98eb60e1459ed80ae48440d241b /net | |
| parent | ea141b75ae29636b5c9e9d2e2e77b3dd1ab4c934 (diff) | |
| download | linux-stable-940d0ac9dbe3fb9d4806e96f006286c2e476deed.tar.gz linux-stable-940d0ac9dbe3fb9d4806e96f006286c2e476deed.tar.bz2 linux-stable-940d0ac9dbe3fb9d4806e96f006286c2e476deed.zip | |
cfg80211: fix rtnl leak in wiphy dump error cases
In two wiphy dump error cases, most often when the dump allocation
must be increased, the RTNL is leaked. This quickly results in a
complete system lockup. Release the RTNL correctly.
Reported-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/nl80211.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 398ce2c59686..e4028197b75d 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -1541,8 +1541,10 @@ static int nl80211_dump_wiphy(struct sk_buff *skb, struct netlink_callback *cb) int ifidx = nla_get_u32(tb[NL80211_ATTR_IFINDEX]); netdev = dev_get_by_index(sock_net(skb->sk), ifidx); - if (!netdev) + if (!netdev) { + rtnl_unlock(); return -ENODEV; + } if (netdev->ieee80211_ptr) { dev = wiphy_to_dev( netdev->ieee80211_ptr->wiphy); @@ -1586,6 +1588,7 @@ static int nl80211_dump_wiphy(struct sk_buff *skb, struct netlink_callback *cb) !skb->len && cb->min_dump_alloc < 4096) { cb->min_dump_alloc = 4096; + rtnl_unlock(); return 1; } idx--; |