Skip to content

Commit 24d0410

Browse files
Srinivas Dasarigregkh
authored andcommitted
cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES
commit d7f13f7450369281a5d0ea463cc69890a15923ae upstream. validate_scan_freqs() retrieves frequencies from attributes nested in the attribute NL80211_ATTR_SCAN_FREQUENCIES with nla_get_u32(), which reads 4 bytes from each attribute without validating the size of data received. Attributes nested in NL80211_ATTR_SCAN_FREQUENCIES don't have an nla policy. Validate size of each attribute before parsing to avoid potential buffer overread. Fixes: 2a51931 ("cfg80211/nl80211: scanning (and mac80211 update to use it)") Signed-off-by: Srinivas Dasari <dasaris@qti.qualcomm.com> Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 05bf0b6 commit 24d0410

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

net/wireless/nl80211.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5706,6 +5706,10 @@ static int validate_scan_freqs(struct nlattr *freqs)
57065706
struct nlattr *attr1, *attr2;
57075707
int n_channels = 0, tmp1, tmp2;
57085708

5709+
nla_for_each_nested(attr1, freqs, tmp1)
5710+
if (nla_len(attr1) != sizeof(u32))
5711+
return 0;
5712+
57095713
nla_for_each_nested(attr1, freqs, tmp1) {
57105714
n_channels++;
57115715
/*

0 commit comments

Comments
 (0)