diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-12-11 12:33:47 +0100 |
|---|---|---|
| committer | Moyster <oysterized@gmail.com> | 2019-05-03 19:26:52 +0200 |
| commit | 4c033c20ea53d9ffb77c92745d030e1efb8b8547 (patch) | |
| tree | c54f20fe9e96ca95c960414ffe00bff4788735f1 /net | |
| parent | 8418ff5f5da2b1b181c7e40d3876490a20d017bd (diff) | |
nl80211: fix nl80211_send_iface() error paths
commit 4564b187c16327045d87596e8980c65ba7b84c50 upstream.
Evidently I introduced a locking bug in my change here,
the nla_put_failure sometimes needs to unlock. Fix it.
Fixes: 44905265bc15 ("nl80211: don't expose wdev->ssid for most interfaces")
Change-Id: I10e56d2a47ec402597a603e0abb3e1335dfb8be3
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/wireless/nl80211.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 8da7db8fb..3431c2329 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -2258,7 +2258,7 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 portid, u32 seq, int flag case NL80211_IFTYPE_AP: if (wdev->ssid_len && nla_put(msg, NL80211_ATTR_SSID, wdev->ssid_len, wdev->ssid)) - goto nla_put_failure; + goto nla_put_failure_locked; break; case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_P2P_CLIENT: @@ -2271,7 +2271,7 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 portid, u32 seq, int flag if (!ssid_ie) break; if (nla_put(msg, NL80211_ATTR_SSID, ssid_ie[1], ssid_ie + 2)) - goto nla_put_failure; + goto nla_put_failure_locked; break; } default: @@ -2282,6 +2282,8 @@ static int nl80211_send_iface(struct sk_buff *msg, u32 portid, u32 seq, int flag return genlmsg_end(msg, hdr); + nla_put_failure_locked: + wdev_unlock(wdev); nla_put_failure: genlmsg_cancel(msg, hdr); return -EMSGSIZE; |