Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1243253 > unrolled thread

[PATCH] staging: wilc1000: fix memory leak on mgmt_tx on error return path

Started byColin King <colin.king@canonical.com>
First post2015-10-09 13:20 +0200
Last post2015-10-10 11:00 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH] staging: wilc1000: fix memory leak on mgmt_tx on error return path Colin King <colin.king@canonical.com> - 2015-10-09 13:20 +0200
    Re: [PATCH] staging: wilc1000: fix memory leak on mgmt_tx on error  return path Sudip Mukherjee <sudipm.mukherjee@gmail.com> - 2015-10-10 11:00 +0200

#1243253 — [PATCH] staging: wilc1000: fix memory leak on mgmt_tx on error return path

FromColin King <colin.king@canonical.com>
Date2015-10-09 13:20 +0200
Subject[PATCH] staging: wilc1000: fix memory leak on mgmt_tx on error return path
Message-ID<qhDSq-tO-7@gated-at.bofh.it>
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(+)

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;
 
 	}
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]


#1243852 — Re: [PATCH] staging: wilc1000: fix memory leak on mgmt_tx on error return path

FromSudip Mukherjee <sudipm.mukherjee@gmail.com>
Date2015-10-10 11:00 +0200
SubjectRe: [PATCH] staging: wilc1000: fix memory leak on mgmt_tx on error return path
Message-ID<qhYau-4iI-3@gated-at.bofh.it>
In reply to#1243253
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-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web