Commit a4f4c725 authored by Johannes Berg's avatar Johannes Berg Committed by Dong Chenchen
Browse files

wifi: mac80211: fix potential key use-after-free

mainline inclusion
from mainline-v5.12-rc6
commit 31db78a4
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I95ASP
CVE: CVE-2023-52530

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=31db78a4923ef5e2008f2eed321811ca79e7f71b



--------------------------------

When ieee80211_key_link() is called by ieee80211_gtk_rekey_add()
but returns 0 due to KRACK protection (identical key reinstall),
ieee80211_gtk_rekey_add() will still return a pointer into the
key, in a potential use-after-free. This normally doesn't happen
since it's only called by iwlwifi in case of WoWLAN rekey offload
which has its own KRACK protection, but still better to fix, do
that by returning an error code and converting that to success on
the cfg80211 boundary only, leaving the error for bad callers of
ieee80211_gtk_rekey_add().

Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Fixes: fdf7cb41 ("mac80211: accept key reinstall without changing anything")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>

Conflicts:
	net/mac80211/cfg.c

Signed-off-by: default avatarDong Chenchen <dongchenchen2@huawei.com>
parent 70c98c7d
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment