Commit dd16b23e authored by Arik Nemtsov's avatar Arik Nemtsov Committed by Jiri Slaby

cfg80211: avoid mem leak on driver hint set

commit 34f05f54 upstream.

In the already-set and intersect case of a driver-hint, the previous
wiphy regdomain was not freed before being reset with a copy of the
cfg80211 regdomain.

[js: backport to 3.12]
Signed-off-by: default avatarArik Nemtsov <arikx.nemtsov@intel.com>
Acked-by: default avatarLuis R. Rodriguez <mcgrof@suse.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
parent dbe21f1d
...@@ -1432,7 +1432,7 @@ static enum reg_request_treatment ...@@ -1432,7 +1432,7 @@ static enum reg_request_treatment
__regulatory_hint(struct wiphy *wiphy, __regulatory_hint(struct wiphy *wiphy,
struct regulatory_request *pending_request) struct regulatory_request *pending_request)
{ {
const struct ieee80211_regdomain *regd; const struct ieee80211_regdomain *regd, *tmp;
bool intersect = false; bool intersect = false;
enum reg_request_treatment treatment; enum reg_request_treatment treatment;
struct regulatory_request *lr; struct regulatory_request *lr;
...@@ -1448,7 +1448,9 @@ __regulatory_hint(struct wiphy *wiphy, ...@@ -1448,7 +1448,9 @@ __regulatory_hint(struct wiphy *wiphy,
kfree(pending_request); kfree(pending_request);
return PTR_ERR(regd); return PTR_ERR(regd);
} }
tmp = get_wiphy_regdom(wiphy);
rcu_assign_pointer(wiphy->regd, regd); rcu_assign_pointer(wiphy->regd, regd);
rcu_free_regdom(tmp);
} }
intersect = true; intersect = true;
break; break;
...@@ -1468,7 +1470,9 @@ __regulatory_hint(struct wiphy *wiphy, ...@@ -1468,7 +1470,9 @@ __regulatory_hint(struct wiphy *wiphy,
return REG_REQ_IGNORE; return REG_REQ_IGNORE;
} }
treatment = REG_REQ_ALREADY_SET; treatment = REG_REQ_ALREADY_SET;
tmp = get_wiphy_regdom(wiphy);
rcu_assign_pointer(wiphy->regd, regd); rcu_assign_pointer(wiphy->regd, regd);
rcu_free_regdom(tmp);
goto new_request; goto new_request;
} }
kfree(pending_request); kfree(pending_request);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment