diff options
| author | Julian Calaby | 2016-03-18 03:29:11 +0100 |
|---|---|---|
| committer | Kalle Valo | 2016-04-07 18:37:50 +0200 |
| commit | 84d17a2a5a0f9e19e25d0472f0528996d945826e (patch) | |
| tree | 81280c305fe55e46481738fccabd0bba9858bead /drivers/net/wireless/intel/iwlegacy/4965-mac.c | |
| parent | iwl4965: Fix a memory leak in error handling code of __il4965_up (diff) | |
| download | kernel-qcow2-linux-84d17a2a5a0f9e19e25d0472f0528996d945826e.tar.gz kernel-qcow2-linux-84d17a2a5a0f9e19e25d0472f0528996d945826e.tar.xz kernel-qcow2-linux-84d17a2a5a0f9e19e25d0472f0528996d945826e.zip | |
iwl4965: Fix more memory leaks in __il4965_up()
In some of the non-success return paths, the memory allocated by
iwl4965_sta_alloc_lq() in iwl4965_alloc_bcast_station() is not freed.
In particular:
- if the card isn't ready after il4965_prepare_card_hw()
- if the card is hardware-rfkilled
In the hardware rfkilled path, the driver enables the rfkill
interrupt. When the card is unrfkilled and this interrupt is raised
we end up calling il4965_bg_restart() which calls __il4965_up() which
calls iwl4965_alloc_bcast_station() again.
Suggested-by: Jia-Ju Bai <baijiaju1990@163.com>
Signed-off-by: Julian Calaby <julian.calaby@gmail.com>
Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/intel/iwlegacy/4965-mac.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c index 30d9dd3dda53..f9ed48070e17 100644 --- a/drivers/net/wireless/intel/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c @@ -5553,6 +5553,7 @@ __il4965_up(struct il_priv *il) il4965_prepare_card_hw(il); if (!il->hw_ready) { + il_dealloc_bcast_stations(il); IL_ERR("HW not ready\n"); return -EIO; } @@ -5564,6 +5565,7 @@ __il4965_up(struct il_priv *il) set_bit(S_RFKILL, &il->status); wiphy_rfkill_set_hw_state(il->hw->wiphy, true); + il_dealloc_bcast_stations(il); il_enable_rfkill_int(il); IL_WARN("Radio disabled by HW RF Kill switch\n"); return 0; |