2014-12-04 10:22:15

by Arik Nemtsov

Subject: [PATCH] cfg80211: avoid mem leak on driver hint set

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.

Cc: [email protected]
Signed-off-by: Arik Nemtsov <[email protected]>
---
net/wireless/reg.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 004ea14..8941e1c 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1916,7 +1916,7 @@ static enum reg_request_treatment
reg_process_hint_driver(struct wiphy *wiphy,
struct regulatory_request *driver_request)
{
- const struct ieee80211_regdomain *regd;
+ const struct ieee80211_regdomain *regd, *tmp;
enum reg_request_treatment treatment;

treatment = __reg_process_hint_driver(driver_request);
@@ -1936,7 +1936,10 @@ reg_process_hint_driver(struct wiphy *wiphy,
reg_free_request(driver_request);
return REG_REQ_IGNORE;
}
+
+ tmp = get_wiphy_regdom(wiphy);
rcu_assign_pointer(wiphy->regd, regd);
+ rcu_free_regdom(tmp);
}


--
1.9.1

2014-12-04 17:37:37

by Luis Chamberlain

Subject: Re: [PATCH] cfg80211: avoid mem leak on driver hint set

On Thu, Dec 04, 2014 at 12:22:16PM +0200, Arik Nemtsov wrote:
> 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.
>
> Cc: [email protected]
> Signed-off-by: Arik Nemtsov <[email protected]>

Acked-by: Luis R. Rodriguez <[email protected]>

Luis

2014-12-12 11:25:49

by Johannes Berg

Subject: Re: [PATCH] cfg80211: avoid mem leak on driver hint set

On Thu, 2014-12-04 at 12:22 +0200, Arik Nemtsov wrote:
> 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.

Applied.

johannes