FAILED: patch "[PATCH] nl80211: Move ACL parsing later to avoid a possible memory" failed to apply to 4.6-stable tree

PATCH [email protected] 1 participant 1 message Aug 8, 2016

Subsystems (2)

Stable branch 802.11 (including cfg80211/NL80211)

lore

Share & tools

lore

[email protected]

author maintainer

2016-08-08 14:13 UTC #0 lore raw

The patch below does not apply to the 4.6-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 6e8ef842223b90a33efd570128bb566a9ae6f5ad Mon Sep 17 00:00:00 2001

From: Purushottam Kushwaha <[email protected]>
Date: Tue, 5 Jul 2016 13:44:51 +0530
Subject: [PATCH] nl80211: Move ACL parsing later to avoid a possible memory
leak

No support for pbss results in a memory leak for the acl_data (if parse_acl_data succeeds). Fix this by moving the ACL parsing later.

Cc [email protected]

Fixes 34d505193bd10 ("cfg80211: basic support for PBSS network type")

Signed-off-by Purushottam Kushwaha <[email protected]>

Signed-off-by Johannes Berg <[email protected]>

net/wireless/nl80211.c +4 -4

index d7599014055d..7d72283901a3 100644
@@ -3487,16 +3487,16 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
 		params.smps_mode = NL80211_SMPS_OFF;
 	}
 
+	params.pbss = nla_get_flag(info->attrs[NL80211_ATTR_PBSS]);
+	if (params.pbss && !rdev->wiphy.bands[NL80211_BAND_60GHZ])
+		return -EOPNOTSUPP;
+
 	if (info->attrs[NL80211_ATTR_ACL_POLICY]) {
 		params.acl = parse_acl_data(&rdev->wiphy, info);
 		if (IS_ERR(params.acl))
 			return PTR_ERR(params.acl);
 	}
 
-	params.pbss = nla_get_flag(info->attrs[NL80211_ATTR_PBSS]);
-	if (params.pbss && !rdev->wiphy.bands[NL80211_BAND_60GHZ])
-		return -EOPNOTSUPP;
-
 	wdev_lock(wdev);
 	err = rdev_start_ap(rdev, dev, &params);
 	if (!err) {