On Tue, Oct 15, 2024 at 03:20:30PM -0700, Sherry Yang wrote:
> From: Johannes Berg <johannes.berg@xxxxxxxxx>
>
> [ Upstream commit 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: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> Fixes: fdf7cb4185b6 ("mac80211: accept key reinstall without changing anything")
> Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
> Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> [Sherry: bp to fix CVE-2023-52530, resolved minor conflicts in
> net/mac80211/cfg.c because of context change due to missing commit
> 23a5f0af6ff4 ("wifi: mac80211: remove cipher scheme support")
> ccdde7c74ffd ("wifi: mac80211: properly implement MLO key handling")]
> Signed-off-by: Sherry Yang <sherry.yang@xxxxxxxxxx>
Now queued up, thanks.
greg k-h
