diff options
| author | Srinivas Dasari <dasaris@qti.qualcomm.com> | 2017-07-07 01:43:42 +0300 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2017-11-02 07:16:30 +0100 |
| commit | d47408188914e18508116fe473c7889208a59a7d (patch) | |
| tree | e7265639c3813cd2ef7dd68d4460122dde16adfe | |
| parent | fa69abfe6a07ae3c009b30271966b871799077b6 (diff) | |
| download | linux-d47408188914e18508116fe473c7889208a59a7d.tar.gz linux-d47408188914e18508116fe473c7889208a59a7d.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)")
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: Willy Tarreau <w@1wt.eu>
| -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 32c5443514cf..67705d7a33f6 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -5044,6 +5044,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++; /* |