diff mbox series

[wireless-next] wifi: mac80211: fix another key installation error path

Message ID 20231020093827.1ef4151a930a.I42ac9a3d8480964d29ba845bbffdf74fe13dae1a@changeid (mailing list archive)
State Accepted
Delegated to: Johannes Berg
Headers show
Series [wireless-next] wifi: mac80211: fix another key installation error path | expand

Commit Message

Johannes Berg Oct. 20, 2023, 7:38 a.m. UTC 
From: Johannes Berg <johannes.berg@intel.com>

Due to overlapping changes and merges, another error
path ended up broken. Fix this one as well.

Reported-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 net/mac80211/key.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index e0ff3a753e15..af74d7f9d94d 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -881,8 +881,10 @@  int ieee80211_key_link(struct ieee80211_key *key,
 		if (link_id >= 0) {
 			link_sta = rcu_dereference_protected(sta->link[link_id],
 							     lockdep_is_held(&sta->local->hw.wiphy->mtx));
-			if (!link_sta)
-				return -ENOLINK;
+			if (!link_sta) {
+				ret = -ENOLINK;
+				goto out;
+			}
 		}
 
 		old_key = wiphy_dereference(sdata->local->hw.wiphy,