diff mbox

staging: wilc1000: fix memory leak on mgmt_tx on error return path

Message ID 1444389093-10309-1-git-send-email-colin.king@canonical.com (mailing list archive)
State Not Applicable
Delegated to: Kalle Valo
Headers show

Commit Message

Colin King Oct. 9, 2015, 11:11 a.m. UTC 
From: Colin Ian King <colin.king@canonical.com>

Static analysis with cppcheck found the following memory leak:

[drivers/staging/wilc1000/linux_mon.c:255]: (error) Memory leak: mgmt_tx

Free mgmt_tx on the error return path when mgmt_tx->buff fails to be
allocated.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/staging/wilc1000/linux_mon.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Sudip Mukherjee Oct. 10, 2015, 8:55 a.m. UTC | #1 
On Fri, Oct 09, 2015 at 12:11:33PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Static analysis with cppcheck found the following memory leak:
> 
> [drivers/staging/wilc1000/linux_mon.c:255]: (error) Memory leak: mgmt_tx
> 
> Free mgmt_tx on the error return path when mgmt_tx->buff fails to be
> allocated.
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---

This has already been done by:
f638dd3918a4 ("staging: wilc1000: fix potential memory leak")

regards
sudip
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/staging/wilc1000/linux_mon.c b/drivers/staging/wilc1000/linux_mon.c
index b8d7d04..f35d6ba 100644
--- a/drivers/staging/wilc1000/linux_mon.c
+++ b/drivers/staging/wilc1000/linux_mon.c
@@ -252,6 +252,7 @@  static int mon_mgmt_tx(struct net_device *dev, const u8 *buf, size_t len)
 	mgmt_tx->buff = kmalloc(len, GFP_ATOMIC);
 	if (mgmt_tx->buff == NULL) {
 		PRINT_ER("Failed to allocate memory for mgmt_tx buff\n");
+		kfree(mgmt_tx);
 		return WILC_FAIL;
 
 	}