2016-10-17 15:25:35

by Wei Yongjun

Subject: [PATCH -next] cfg80211: fix possible memory leak in cfg80211_iter_combinations()

From: Wei Yongjun <[email protected]>

'limits' is malloced in cfg80211_iter_combinations() and should be freed
before leaving from the error handling cases, otherwise it will cause
memory leak.

Fixes: 0c317a02ca98 ("cfg80211: support virtual interfaces with different
beacon intervals")
Signed-off-by: Wei Yongjun <[email protected]>
---
net/wireless/util.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/wireless/util.c b/net/wireless/util.c
index dd545ff..e36dbae 100644
--- a/net/wireless/util.c
+++ b/net/wireless/util.c
@@ -1672,8 +1672,10 @@ int cfg80211_iter_combinations(struct wiphy *wiphy,

if (params->beacon_int_gcd) {
if (c->beacon_int_min_gcd &&
- params->beacon_int_gcd < c->beacon_int_min_gcd)
+ params->beacon_int_gcd < c->beacon_int_min_gcd) {
+ kfree(limits);
return -EINVAL;
+ }
if (!c->beacon_int_min_gcd &&
params->beacon_int_different)
goto cont;

2016-10-18 06:51:56

by Johannes Berg

Subject: Re: [PATCH -next] cfg80211: fix possible memory leak in cfg80211_iter_combinations()

On Mon, 2016-10-17 at 15:25 +0000, Wei Yongjun wrote:
> From: Wei Yongjun <[email protected]>
>
> 'limits' is malloced in cfg80211_iter_combinations() and should be
> freed
> before leaving from the error handling cases, otherwise it will cause
> memory leak.

Yep, thanks; applied.

johannes