Patch "cfg80211: Check if NAN service ID is of expected size" has been added to the 4.11-stable tree

This is a note to let you know that I've just added the patch titled

cfg80211: Check if NAN service ID is of expected size

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-check-if-nan-service-id-is-of-expected-size.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 <[email protected]> know about it.

From: Srinivas Dasari <[email protected]>
Date: Fri, 7 Jul 2017 01:43:40 +0300
Subject: cfg80211: Check if NAN service ID is of expected size

From: Srinivas Dasari <[email protected]>

commit 0a27844ce86d039d74221dd56cd8c0349b146b63 upstream.

nla policy checks for only maximum length of the attribute data when the attribute type is NLA_BINARY. If userspace sends less data than specified, cfg80211 may access illegal memory. When type is NLA_UNSPEC, nla policy check ensures that userspace sends minimum specified length number of bytes.

Remove type assignment to NLA_BINARY from nla_policy of NL80211_NAN_FUNC_SERVICE_ID to make these NLA_UNSPEC and to make sure minimum NL80211_NAN_FUNC_SERVICE_ID_LEN bytes are received from userspace with NL80211_NAN_FUNC_SERVICE_ID.

---
 net/wireless/nl80211.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

@@ -509,7 +509,7 @@ nl80211_bss_select_policy[NL80211_BSS_SE
 static const struct nla_policy
 nl80211_nan_func_policy[NL80211_NAN_FUNC_ATTR_MAX + 1] = {
 	[NL80211_NAN_FUNC_TYPE] = { .type = NLA_U8 },
-	[NL80211_NAN_FUNC_SERVICE_ID] = { .type = NLA_BINARY,
+	[NL80211_NAN_FUNC_SERVICE_ID] = {
 				    .len = NL80211_NAN_FUNC_SERVICE_ID_LEN },
 	[NL80211_NAN_FUNC_PUBLISH_TYPE] = { .type = NLA_U8 },
 	[NL80211_NAN_FUNC_PUBLISH_BCAST] = { .type = NLA_FLAG },

Patches currently in stable-queue which might be from [email protected] 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