summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2020-10-29 22:24:07 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-12-30 11:53:03 +0100
commit615bc1ba5b87843f932ea729b6c3304f58faf7bb (patch)
tree1ee1ba680bf0091339abfc86a929edc8a08ba1ca /net
parent6e5ea342fc652573d29adcdeb805081dd7253e67 (diff)
downloadlinux-stable-615bc1ba5b87843f932ea729b6c3304f58faf7bb.tar.gz
linux-stable-615bc1ba5b87843f932ea729b6c3304f58faf7bb.tar.bz2
linux-stable-615bc1ba5b87843f932ea729b6c3304f58faf7bb.zip
nl80211/cfg80211: fix potential infinite loop
[ Upstream commit ba5c25236bc3d399df82ebe923490ea8d2d35cf2 ] The for-loop iterates with a u8 loop counter and compares this with the loop upper limit of request->n_ssids which is an int type. There is a potential infinite loop if n_ssids is larger than the u8 loop counter, so fix this by making the loop counter an int. Addresses-Coverity: ("Infinite loop") Fixes: c8cb5b854b40 ("nl80211/cfg80211: support 6 GHz scanning") Signed-off-by: Colin Ian King <colin.king@canonical.com> Link: https://lore.kernel.org/r/20201029222407.390218-1-colin.king@canonical.com Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/scan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 8d0e49c46db3..3409f37d838b 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -694,7 +694,7 @@ static void cfg80211_scan_req_add_chan(struct cfg80211_scan_request *request,
static bool cfg80211_find_ssid_match(struct cfg80211_colocated_ap *ap,
struct cfg80211_scan_request *request)
{
- u8 i;
+ int i;
u32 s_ssid;
for (i = 0; i < request->n_ssids; i++) {