aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2023-10-05 23:09:18 +0200
committerJohannes Berg <johannes.berg@intel.com>2023-10-11 16:36:14 +0200
commit02e0e426a2fb1446ebd7bc0eccfb48aedefb966b (patch)
tree454e3242c0a84b34d13dd0d2192d2119fa7af60c /net/mac80211
parent91d20ab9d9ca035527af503d00e1e30d6c375f2a (diff)
downloadlinux-02e0e426a2fb1446ebd7bc0eccfb48aedefb966b.tar.gz
wifi: mac80211: fix error path key leak
In the previous key leak fix for the other error paths, I meant to unify all of them to the same place, but used the wrong label, which I noticed when doing the merge into wireless-next. Fix it. Fixes: d097ae01ebd4 ("wifi: mac80211: fix potential key leak") Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r--net/mac80211/key.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 0665ff5e456eb..a2db0585dce0d 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -912,7 +912,7 @@ int ieee80211_key_link(struct ieee80211_key *key,
*/
if (ieee80211_key_identical(sdata, old_key, key)) {
ret = -EALREADY;
- goto unlock;
+ goto out;
}
key->local = sdata->local;
@@ -940,7 +940,6 @@ int ieee80211_key_link(struct ieee80211_key *key,
out:
ieee80211_key_free_unused(key);
- unlock:
mutex_unlock(&sdata->local->key_mtx);
return ret;