Commit e4712906 authored by Srinivas Dasari's avatar Srinivas Dasari Committed by Greg Kroah-Hartman

cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES

commit d7f13f74 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: 2a519311 ("cfg80211/nl80211: scanning (and mac80211 update to use it)")
Signed-off-by: default avatarSrinivas Dasari <dasaris@qti.qualcomm.com>
Signed-off-by: default avatarJouni Malinen <jouni@qca.qualcomm.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b68aa7df
...@@ -6327,6 +6327,10 @@ static int validate_scan_freqs(struct nlattr *freqs) ...@@ -6327,6 +6327,10 @@ static int validate_scan_freqs(struct nlattr *freqs)
struct nlattr *attr1, *attr2; struct nlattr *attr1, *attr2;
int n_channels = 0, tmp1, tmp2; int n_channels = 0, tmp1, tmp2;
nla_for_each_nested(attr1, freqs, tmp1)
if (nla_len(attr1) != sizeof(u32))
return 0;
nla_for_each_nested(attr1, freqs, tmp1) { nla_for_each_nested(attr1, freqs, tmp1) {
n_channels++; n_channels++;
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment