Commit c7439305 authored Aug 22, 2024 by Baochen Qiang Committed by Liu Jian Aug 22, 2024

wifi: cfg80211: handle 2x996 RU allocation in cfg80211_calculate_bitrate_he()

stable inclusion
from stable-v5.10.224
commit 2e201b3d162c6c49417c438ffb30b58c9f85769f
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IALEA1
CVE: CVE-2024-43879

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2e201b3d162c6c49417c438ffb30b58c9f85769f



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

[ Upstream commit bcbd771cd5d68c0c52567556097d75f9fc4e7cd6 ]

Currently NL80211_RATE_INFO_HE_RU_ALLOC_2x996 is not handled in
cfg80211_calculate_bitrate_he(), leading to below warning:

kernel: invalid HE MCS: bw:6, ru:6
kernel: WARNING: CPU: 0 PID: 2312 at net/wireless/util.c:1501 cfg80211_calculate_bitrate_he+0x22b/0x270 [cfg80211]

Fix it by handling 2x996 RU allocation in the same way as 160 MHz bandwidth.

Fixes: c4cbaf79 ("cfg80211: Add support for HE")
Signed-off-by: Baochen Qiang <quic_bqiang@quicinc.com>
Link: https://msgid.link/20240606020653.33205-3-quic_bqiang@quicinc.com


Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Liu Jian <liujian56@huawei.com>

parent e9437292

net/wireless/util.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1357,7 +1357,9 @@ static u32 cfg80211_calculate_bitrate_he(struct rate_info *rate)
		if (WARN_ON_ONCE(rate->nss < 1 \|\| rate->nss > 8))
		return 0;

		if (rate->bw == RATE_INFO_BW_160)
		if (rate->bw == RATE_INFO_BW_160 \|\|
		(rate->bw == RATE_INFO_BW_HE_RU &&
		rate->he_ru_alloc == NL80211_RATE_INFO_HE_RU_ALLOC_2x996))
		result = rates_160M[rate->he_gi];
		else if (rate->bw == RATE_INFO_BW_80 \|\|
		(rate->bw == RATE_INFO_BW_HE_RU &&