* [PATCH] wifi: ath11k: fix gtk offload status event locking
@ 2023-10-19 15:53 Johan Hovold
2023-10-19 17:27 ` Jeff Johnson
2023-10-25 10:01 ` Kalle Valo
0 siblings, 2 replies; 3+ messages in thread
From: Johan Hovold @ 2023-10-19 15:53 UTC (permalink / raw)
To: Kalle Valo
Cc: Jeff Johnson, ath11k, linux-wireless, linux-kernel, Johan Hovold,
stable, Carl Huang
The ath11k active pdevs are protected by RCU but the gtk offload status
event handling code calling ath11k_mac_get_arvif_by_vdev_id() was not
marked as a read-side critical section.
Mark the code in question as an RCU read-side critical section to avoid
any potential use-after-free issues.
Fixes: a16d9b50cfba ("ath11k: support GTK rekey offload")
Cc: stable@vger.kernel.org # 5.18
Cc: Carl Huang <quic_cjhuang@quicinc.com>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
---
...and here's one more, this time using the
ath11k_mac_get_arvif_by_vdev_id() helper.
Johan
drivers/net/wireless/ath/ath11k/wmi.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c
index f0eac6cb84fd..78af659b1ccd 100644
--- a/drivers/net/wireless/ath/ath11k/wmi.c
+++ b/drivers/net/wireless/ath/ath11k/wmi.c
@@ -8618,12 +8618,13 @@ static void ath11k_wmi_gtk_offload_status_event(struct ath11k_base *ab,
return;
}
+ rcu_read_lock();
+
arvif = ath11k_mac_get_arvif_by_vdev_id(ab, ev->vdev_id);
if (!arvif) {
ath11k_warn(ab, "failed to get arvif for vdev_id:%d\n",
ev->vdev_id);
- kfree(tb);
- return;
+ goto exit;
}
ath11k_dbg(ab, ATH11K_DBG_WMI, "event gtk offload refresh_cnt %d\n",
@@ -8640,6 +8641,8 @@ static void ath11k_wmi_gtk_offload_status_event(struct ath11k_base *ab,
ieee80211_gtk_rekey_notify(arvif->vif, arvif->bssid,
(void *)&replay_ctr_be, GFP_ATOMIC);
+exit:
+ rcu_read_unlock();
kfree(tb);
}
--
2.41.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] wifi: ath11k: fix gtk offload status event locking
2023-10-19 15:53 [PATCH] wifi: ath11k: fix gtk offload status event locking Johan Hovold
@ 2023-10-19 17:27 ` Jeff Johnson
2023-10-25 10:01 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Jeff Johnson @ 2023-10-19 17:27 UTC (permalink / raw)
To: Johan Hovold, Kalle Valo
Cc: ath11k, linux-wireless, linux-kernel, stable, Carl Huang
On 10/19/2023 8:53 AM, Johan Hovold wrote:
> The ath11k active pdevs are protected by RCU but the gtk offload status
> event handling code calling ath11k_mac_get_arvif_by_vdev_id() was not
> marked as a read-side critical section.
>
> Mark the code in question as an RCU read-side critical section to avoid
> any potential use-after-free issues.
>
> Fixes: a16d9b50cfba ("ath11k: support GTK rekey offload")
> Cc: stable@vger.kernel.org # 5.18
> Cc: Carl Huang <quic_cjhuang@quicinc.com>
> Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] wifi: ath11k: fix gtk offload status event locking
2023-10-19 15:53 [PATCH] wifi: ath11k: fix gtk offload status event locking Johan Hovold
2023-10-19 17:27 ` Jeff Johnson
@ 2023-10-25 10:01 ` Kalle Valo
1 sibling, 0 replies; 3+ messages in thread
From: Kalle Valo @ 2023-10-25 10:01 UTC (permalink / raw)
To: Johan Hovold
Cc: Jeff Johnson, ath11k, linux-wireless, linux-kernel, Johan Hovold,
stable, Carl Huang
Johan Hovold <johan+linaro@kernel.org> wrote:
> The ath11k active pdevs are protected by RCU but the gtk offload status
> event handling code calling ath11k_mac_get_arvif_by_vdev_id() was not
> marked as a read-side critical section.
>
> Mark the code in question as an RCU read-side critical section to avoid
> any potential use-after-free issues.
>
> Compile tested only.
>
> Fixes: a16d9b50cfba ("ath11k: support GTK rekey offload")
> Cc: stable@vger.kernel.org # 5.18
> Cc: Carl Huang <quic_cjhuang@quicinc.com>
> Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
> Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Patch applied to ath-next branch of ath.git, thanks.
1dea3c0720a1 wifi: ath11k: fix gtk offload status event locking
--
https://patchwork.kernel.org/project/linux-wireless/patch/20231019155342.31631-1-johan+linaro@kernel.org/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-25 10:01 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-10-19 15:53 [PATCH] wifi: ath11k: fix gtk offload status event locking Johan Hovold
2023-10-19 17:27 ` Jeff Johnson
2023-10-25 10:01 ` Kalle Valo
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).