diff options
author | Srinivas Dasari <dasaris@qti.qualcomm.com> | 2017-07-07 01:43:42 +0300 |
---|---|---|
committer | Sasha Levin <alexander.levin@verizon.com> | 2017-07-31 13:37:54 -0400 |
commit | 7189535967e9928349200f1922ca8e82e309eb6f (patch) | |
tree | ca2c4d37825874389e30e7e37659765d1c05da96 | |
parent | e61d75e0d800c7f4469d391e3598b890be11d95c (diff) |
cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES
[ Upstream commit d7f13f7450369281a5d0ea463cc69890a15923ae ]
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: 2a519311926 ("cfg80211/nl80211: scanning (and mac80211 update to use it)")
Cc: stable@vger.kernel.org
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: Sasha Levin <alexander.levin@verizon.com>
-rw-r--r-- | net/wireless/nl80211.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 3e8f873cca38..c3f6c770aa0d 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -5679,6 +5679,10 @@ static int validate_scan_freqs(struct nlattr *freqs) struct nlattr *attr1, *attr2; 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) { n_channels++; /* |