wifi: cfg80211: wext: add extra SIOCSIWSCAN data check
Subsystems (3)
Sasha Levin
maintainerPATCH 1/1 wifi: cfg80211: wext: add extra SIOCSIWSCAN data check
From: Dmitry Antipov <[email protected]>
[ 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.
--- net/wireless/scan.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
net/wireless/scan.c +6 -2
@@ -1405,10 +1405,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 *),
Signature · 1 line
2.43.0
Hi!
Quoted 5 lines
[ Upstream commit
6ef09cdc5ba0f93826c09d810c141a8d103a80fc]In '
cfg80211_wext_siwscan()', add extra check whether number of channels passed via 'ioctl(sock, SIOCSIWSCAN, ...)' doesn't exceedIW_MAX_FREQUENCIESand reject invalid request with-EINVALotherwise.
This results in very confusing code in 4.19 at least. It should goto out for consistency, exploting kfree(NULL) to be nop. Ok, not sure we care...
Best regards,
Pavel
Quoted 21 lines
net/wireless/scan.c +6
-2@@ -1405,10 +1405,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 *),
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Quoted 11 lines · Pavel Machek
Hi!
Quoted 5 lines
[ Upstream commit
6ef09cdc5ba0f93826c09d810c141a8d103a80fc]In '
cfg80211_wext_siwscan()', add extra check whether number of channels passed via 'ioctl(sock, SIOCSIWSCAN, ...)' doesn't exceedIW_MAX_FREQUENCIESand reject invalid request with-EINVALotherwise.This results in very confusing code in 4.19 at least. It should goto out for consistency, exploting kfree(NULL) to be nop. Ok, not sure we care...
kfree(NULL) is always supposed to be a nop, we have relied on that for decades, that's not an issue anywhere.
greg k-h
Quoted 9 lines · Greg KH
Quoted 8 lines · Pavel Machek
Hi!
Quoted 5 lines
[ Upstream commit
6ef09cdc5ba0f93826c09d810c141a8d103a80fc]In '
cfg80211_wext_siwscan()', add extra check whether number of channels passed via 'ioctl(sock, SIOCSIWSCAN, ...)' doesn't exceedIW_MAX_FREQUENCIESand reject invalid request with-EINVALotherwise.
Quoted 6 lines
Quoted 3 lines
This results in very confusing code in 4.19 at least. It should goto out for consistency, exploting kfree(NULL) to be nop. Ok, not sure we care...
kfree(NULL) is always supposed to be a nop, we have relied on that for decades, that's not an issue anywhere.
Take a look at the code, especially after this patch is applied.
BR,
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Erika Unter HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany