This is a note to let you know that I've just added the patch titled cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES to the 4.11-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: cfg80211-validate-frequencies-nested-in-nl80211_attr_scan_frequencies.patch and it can be found in the queue-4.11 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From d7f13f7450369281a5d0ea463cc69890a15923ae Mon Sep 17 00:00:00 2001 From: Srinivas Dasari <dasaris@xxxxxxxxxxxxxxxx> Date: Fri, 7 Jul 2017 01:43:42 +0300 Subject: cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES From: Srinivas Dasari <dasaris@xxxxxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxxx> Signed-off-by: Jouni Malinen <jouni@xxxxxxxxxxxxxxxx> Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- net/wireless/nl80211.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -6422,6 +6422,10 @@ static int validate_scan_freqs(struct nl 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++; /* Patches currently in stable-queue which might be from dasaris@xxxxxxxxxxxxxxxx are queue-4.11/cfg80211-validate-frequencies-nested-in-nl80211_attr_scan_frequencies.patch queue-4.11/cfg80211-check-if-pmkid-attribute-is-of-expected-size.patch queue-4.11/cfg80211-define-nla_policy-for-nl80211_attr_local_mesh_power_mode.patch queue-4.11/cfg80211-check-if-nan-service-id-is-of-expected-size.patch