nl80211: Move ACL parsing later to avoid a possible memory leak (6e8ef842) · Commits · 戴 / test

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: stable@vger.kernel.org Fixes: ("cfg80211: basic support for PBSS network type") Signed-off-by:

Purushottam Kushwaha <pkushwah@qti.qualcomm.com> Signed-off-by:

Johannes Berg <johannes@sipsolutions.net>

net/wireless/nl80211.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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) {

Admin message