| Message ID | 20231019155342.31631-1-johan+linaro@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1dea3c0720a146bd7193969f2847ccfed5be2221 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: ath11k: fix gtk offload status event locking | expand |
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>
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
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); }
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(-)