2013-06-20 07:17:33

by Mohammed Shafi Shajakhan

Subject: [PATCH] ath6kl: Fix race in heart beat polling

From: Vasanthakumar Thiagarajan <[email protected]>

Make sure to cancel heart beat timer before
freeing wmi to avoid potential NULL pointer
dereference.

Signed-off-by: Vasanthakumar Thiagarajan <[email protected]>
Signed-off-by: Mohammed Shafi Shajakhan <[email protected]>
---
drivers/net/wireless/ath/ath6kl/init.c | 3 +++
1 file changed, 3 insertions(+)

diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index 6a67881..4f316bd 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -1836,6 +1836,9 @@ void ath6kl_stop_txrx(struct ath6kl *ar)

clear_bit(WMI_READY, &ar->flag);

+ if (ar->fw_recovery.enable)
+ del_timer_sync(&ar->fw_recovery.hb_timer);
+
/*
* After wmi_shudown all WMI events will be dropped. We
* need to cleanup the buffers allocated in AP mode and
--
1.7.9.5

2013-08-07 07:55:42

by Kalle Valo

Subject: Re: [PATCH] ath6kl: Fix race in heart beat polling

Mohammed Shafi Shajakhan <[email protected]> writes:

> From: Vasanthakumar Thiagarajan <[email protected]>
>
> Make sure to cancel heart beat timer before
> freeing wmi to avoid potential NULL pointer
> dereference.
>
> Signed-off-by: Vasanthakumar Thiagarajan <[email protected]>
> Signed-off-by: Mohammed Shafi Shajakhan <[email protected]>

Thanks, applied.

--
Kalle Valo