evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nl80211: Move ACL parsing later to avoid a possible memory leak

Browse source 
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: 34d505193bd10 ("cfg80211: basic support for PBSS network type")
Signed-off-by: Purushottam Kushwaha <pkushwah@qti.qualcomm.com>
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Git-repo: git://git.kernel.org/cgit/linux/kernel/git/jberg/mac80211.git
Git-commit: 6e8ef842223b90a33efd570128bb566a9ae6f5ad
CRs-fixed: 1024951
Change-Id: I5750ae9091ca349e98bba4b24c78ef9446278c5a
Signed-off-by: Purushottam Kushwaha <pkushwah@codeaurora.org>
This commit is contained in:
Purushottam Kushwaha 2016-07-07 16:19:08 +05:30 • committed by Gerrit - the friendly Code Review server
parent 400520a6e2
commit 888a82c476
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
net/wireless/nl80211.c
View file

@ -3456,16 +3456,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[IEEE80211_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[IEEE80211_BAND_60GHZ])
return -EOPNOTSUPP;
wdev_lock(wdev); wdev_lock(wdev);
err = rdev_start_ap(rdev, dev, &params); err = rdev_start_ap(rdev, dev, &params);
if (!err) { if (!err) {