Unverified Commit 174c4eef authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6181 [sync] PR-5093: wifi: mac80211: fix potential key use-after-free 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/5093 
 
PR sync from: Dong Chenchen <dongchenchen2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/O7HTWP5V3B4BLF724VPDAQDYH3ZNTTZN/ 
 
https://gitee.com/src-openeuler/kernel/issues/I95ASP 
 
Link:https://gitee.com/openeuler/kernel/pulls/6181

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents cf69ba26 bb19fe48

net/mac80211/cfg.c

+3 −0
Original line number Diff line number Diff line
@@ -509,6 +509,9 @@ static int ieee80211_add_key(struct wiphy *wiphy, struct net_device *dev, 
		sta->cipher_scheme = cs;



	err = ieee80211_key_link(key, sdata, sta);

	/* KRACK protection, shouldn't happen but just silently accept key */

	if (err == -EALREADY)

		err = 0;



 out_unlock:

	mutex_unlock(&local->sta_mtx);

net/mac80211/key.c

+1 −1
Original line number Diff line number Diff line
@@ -843,7 +843,7 @@ int ieee80211_key_link(struct ieee80211_key *key, 
	 */

	if (ieee80211_key_identical(sdata, old_key, key)) {

		ieee80211_key_free_unused(key);

		ret = 0;

		ret = -EALREADY;

		goto out;

	}