2022-08-27 02:16:53

by Sun Ke

Subject: [PATCH] mac80211: fix potential deadlock in ieee80211_key_link()

Add the missing unlock before return in the error handling case.

Fixes: ccdde7c74ffd ("wifi: mac80211: properly implement MLO key handling")
Signed-off-by: Sun Ke <[email protected]>
---
net/mac80211/key.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index 86aac87e0211..d89ec93b243b 100644
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -865,8 +865,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->sta_mtx));
- if (!link_sta)
- return -ENOLINK;
+ if (!link_sta) {
+ ret = -ENOLINK;
+ goto out;
+ }
}

old_key = key_mtx_dereference(sdata->local, link_sta->gtk[idx]);
--
2.31.1

2022-09-01 04:42:25

by Kalle Valo

Subject: Re: [PATCH] mac80211: fix potential deadlock in ieee80211_key_link()

Sun Ke <[email protected]> writes:

> Add the missing unlock before return in the error handling case.
>
> Fixes: ccdde7c74ffd ("wifi: mac80211: properly implement MLO key handling")
> Signed-off-by: Sun Ke <[email protected]>

The title is missing "wifi:".

--
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

2022-09-01 06:44:10

by Sun Ke

Subject: Re: [PATCH] mac80211: fix potential deadlock in ieee80211_key_link()

?? 2022/9/1 12:41, Kalle Valo д??:
> Sun Ke <[email protected]> writes:
>
>> Add the missing unlock before return in the error handling case.
>>
>> Fixes: ccdde7c74ffd ("wifi: mac80211: properly implement MLO key handling")
>> Signed-off-by: Sun Ke <[email protected]>
>
> The title is missing "wifi:".

Johannes had modified it by hand.

Thanks,
Sun Ke
>