diff options
| author | Srinivas Dasari <dasaris@qti.qualcomm.com> | 2017-07-07 01:43:42 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-21 07:00:10 +0200 |
| commit | 880b98c33913e23c6f97e5f838b235faa9d54abb (patch) | |
| tree | aa7f0a94fcea782e6ea44a9c52d2ee68b6d5463c | |
| parent | 61d3f24df74b44a00f4662a679446d0ed1f5fdf5 (diff) | |
| download | linux-880b98c33913e23c6f97e5f838b235faa9d54abb.tar.gz linux-880b98c33913e23c6f97e5f838b235faa9d54abb.tar.bz2 linux-880b98c33913e23c6f97e5f838b235faa9d54abb.zip | |
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: 2a519311926 ("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>
| -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 13050bf8fbf3..f6d2ca413ab0 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -6422,6 +6422,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++; /* |