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: stable@vger.kernel.org
Fixes: 34d505193b
("cfg80211: basic support for PBSS network type")
Signed-off-by: Purushottam Kushwaha <pkushwah@qti.qualcomm.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
This commit is contained in:
parent
c041778c96
commit
6e8ef84222
|
@ -3487,16 +3487,16 @@ static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info)
|
||||||
params.smps_mode = NL80211_SMPS_OFF;
|
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]) {
|
if (info->attrs[NL80211_ATTR_ACL_POLICY]) {
|
||||||
params.acl = parse_acl_data(&rdev->wiphy, info);
|
params.acl = parse_acl_data(&rdev->wiphy, info);
|
||||||
if (IS_ERR(params.acl))
|
if (IS_ERR(params.acl))
|
||||||
return PTR_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);
|
wdev_lock(wdev);
|
||||||
err = rdev_start_ap(rdev, dev, ¶ms);
|
err = rdev_start_ap(rdev, dev, ¶ms);
|
||||||
if (!err) {
|
if (!err) {
|
||||||
|
|
Loading…
Reference in New Issue