2013-12-31 08:31:07

by Zhao, Gang

Subject: [PATCH] mac80211: fix possible memory leak in ieee80211_register_hw()

Before return, free allocated memory in this function.

Signed-off-by: ZHAO Gang <[email protected]>
---
net/mac80211/main.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/mac80211/main.c b/net/mac80211/main.c
index 2bd5b55..7ee0e8a 100644
--- a/net/mac80211/main.c
+++ b/net/mac80211/main.c
@@ -876,8 +876,10 @@ int ieee80211_register_hw(struct ieee80211_hw *hw)

for (j = 0; j < c->n_limits; j++)
if ((c->limits[j].types & BIT(NL80211_IFTYPE_ADHOC)) &&
- c->limits[j].max > 1)
+ c->limits[j].max > 1) {
+ kfree(local->int_scan_req);
return -EINVAL;
+ }
}

#ifndef CONFIG_MAC80211_MESH
--
1.8.4.2

2013-12-31 10:24:18

by Ujjal Roy

Subject: Re: [PATCH] mac80211: fix possible memory leak in ieee80211_register_hw()

On Tue, Dec 31, 2013 at 2:00 PM, ZHAO Gang <[email protected]> wrote:
> Before return, free allocated memory in this function.
>
> Signed-off-by: ZHAO Gang <[email protected]>

very good catch...

--
Thanks,
UjjaL Roy