Commit 18e61046 authored by Dmitry Antipov's avatar Dmitry Antipov Committed by Liu Jian
Browse files

wifi: cfg80211: wext: add extra SIOCSIWSCAN data check 

stable inclusion
from stable-v6.6.42
commit fe9644efd86704afe50e56b64b609de340ab7c95
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAGELZ
CVE: CVE-2024-41072

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



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

[ Upstream commit 6ef09cdc5ba0f93826c09d810c141a8d103a80fc ]

In 'cfg80211_wext_siwscan()', add extra check whether number of
channels passed via 'ioctl(sock, SIOCSIWSCAN, ...)' doesn't exceed
IW_MAX_FREQUENCIES and reject invalid request with -EINVAL otherwise.

Reported-by: default avatar <syzbot+253cd2d2491df77c93ac@syzkaller.appspotmail.com>
Closes: https://syzkaller.appspot.com/bug?extid=253cd2d2491df77c93ac


Signed-off-by: default avatarDmitry Antipov <dmantipov@yandex.ru>
Link: https://msgid.link/20240531032010.451295-1-dmantipov@yandex.ru


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarLiu Jian <liujian56@huawei.com>
parent 4a58051a

net/wireless/scan.c

+6 −2
Original line number Diff line number Diff line
@@ -3163,10 +3163,14 @@ int cfg80211_wext_siwscan(struct net_device *dev, 
	wiphy = &rdev->wiphy;



	/* Determine number of channels, needed to allocate creq */

	if (wreq && wreq->num_channels)

	if (wreq && wreq->num_channels) {

		/* Passed from userspace so should be checked */

		if (unlikely(wreq->num_channels > IW_MAX_FREQUENCIES))

			return -EINVAL;

		n_channels = wreq->num_channels;

	else

	} else {

		n_channels = ieee80211_get_num_supported_channels(wiphy);

	}



	creq = kzalloc(sizeof(*creq) + sizeof(struct cfg80211_ssid) +

		       n_channels * sizeof(void *),