linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] iwl4965: Fix a memory leak in error handling code of __il4965_up
@ 2016-01-07 12:17 Jia-Ju Bai
  2016-01-11 12:13 ` Stanislaw Gruszka
  0 siblings, 1 reply; 2+ messages in thread
From: Jia-Ju Bai @ 2016-01-07 12:17 UTC (permalink / raw)
  To: sgruszka, kvalo; +Cc: linux-wireless, netdev, linux-kernel, Jia-Ju Bai

When il4965_hw_nic_init in __il4965_up fails, the memory allocated by 
iwl4965_sta_alloc_lq in iwl4965_alloc_bcast_station is not freed.

This patches adds il_dealloc_bcast_stations in the error handling code of 
__il4965_up to fix this problem.

This patch has been tested in real device, and it actually fixes the bug.

Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
---
 drivers/net/wireless/iwlegacy/4965-mac.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/wireless/iwlegacy/4965-mac.c b/drivers/net/wireless/iwlegacy/4965-mac.c
index 6656215..fd7b5c7 100644
--- a/drivers/net/wireless/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/iwlegacy/4965-mac.c
@@ -5577,6 +5577,7 @@ __il4965_up(struct il_priv *il)
 	ret = il4965_hw_nic_init(il);
 	if (ret) {
 		IL_ERR("Unable to init nic\n");
+		il_dealloc_bcast_stations(il);
 		return ret;
 	}
 
-- 
1.7.9.5



^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] iwl4965: Fix a memory leak in error handling code of __il4965_up
  2016-01-07 12:17 [PATCH] iwl4965: Fix a memory leak in error handling code of __il4965_up Jia-Ju Bai
@ 2016-01-11 12:13 ` Stanislaw Gruszka
  0 siblings, 0 replies; 2+ messages in thread
From: Stanislaw Gruszka @ 2016-01-11 12:13 UTC (permalink / raw)
  To: Jia-Ju Bai; +Cc: kvalo, linux-wireless, netdev, linux-kernel

On Thu, Jan 07, 2016 at 08:17:39PM +0800, Jia-Ju Bai wrote:
> When il4965_hw_nic_init in __il4965_up fails, the memory allocated by 
> iwl4965_sta_alloc_lq in iwl4965_alloc_bcast_station is not freed.
> 
> This patches adds il_dealloc_bcast_stations in the error handling code of 
> __il4965_up to fix this problem.
> 
> This patch has been tested in real device, and it actually fixes the bug.
> 
> Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>

Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2016-01-11 12:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-07 12:17 [PATCH] iwl4965: Fix a memory leak in error handling code of __il4965_up Jia-Ju Bai
2016-01-11 12:13 ` Stanislaw Gruszka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).