netdev.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-10  2:19 Jia-Ju Bai
       [not found] ` <1452392363-3600-1-git-send-email-baijiaju1990-9Onoh4P/yGk@public.gmane.org>
  0 siblings, 1 reply; 6+ messages in thread
From: Jia-Ju Bai @ 2016-01-10  2:19 UTC (permalink / raw)
  To: sgruszka-H+wXaHxf7aLQT0dZR+AlfA, kvalo-sgV2jX0FEOL9JmXXK+q4OQ,
	johannes.berg-ral2JQCrhuEAvxtiuMwx3w,
	emmanuel.grumbach-ral2JQCrhuEAvxtiuMwx3w
  Cc: ilw-VuQAYsv1563Yd54FQh9/CA, linuxwifi-ral2JQCrhuEAvxtiuMwx3w,
	linux-wireless-u79uwXL29TY76Z2rM5mHXA,
	netdev-u79uwXL29TY76Z2rM5mHXA, 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-9Onoh4P/yGk@public.gmane.org>
---
 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


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

^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [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; 6+ 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] 6+ messages in thread

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

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-10  2:19 [PATCH] iwl4965: Fix a memory leak in error handling code of __il4965_up Jia-Ju Bai
     [not found] ` <1452392363-3600-1-git-send-email-baijiaju1990-9Onoh4P/yGk@public.gmane.org>
2016-01-11 12:16   ` Stanislaw Gruszka
2016-01-11 12:44     ` Kalle Valo
2016-01-11 13:41     ` Jia-Ju Bai
  -- strict thread matches above, loose matches on Subject: below --
2016-01-07 12:17 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).