Skip to contentSkip to conversation

wifi: ath11k: fix gtk offload status event locking

PATCH In review Johan Hovold 3 participants 3 messages Oct 19, 2023 – Oct 25, 2023

Subsystems (2)
Stable branch Qualcomm Atheros ATH11K wireless driver
lore
Share & tools
lore

Johan Hovold

author
#0 lore raw

PATCH 1/1 wifi: ath11k: fix gtk offload status event locking

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 [email protected] # 5.18
Cc Carl Huang <[email protected]>
Signed-off-by Johan Hovold <[email protected]>

---

...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(-)
drivers/net/wireless/ath/ath11k/wmi.c +5 -2
index f0eac6cb84fd..78af659b1ccd 100644
@@ -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);
 }
Signature · 1 line
2.41.0
Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · Johan Hovold

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 [email protected] # 5.18
Cc Carl Huang <[email protected]>
Signed-off-by Johan Hovold <[email protected]>
Acked-by Jeff Johnson <[email protected]>
Signature · 3 lines
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k
#2 lore raw
In reply to Johan Hovold
Quoted 7 lines · Johan Hovold

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.

Quoted 8 lines

Compile tested only.

Fixes a16d9b50cfba ("ath11k: support GTK rekey offload")
Cc [email protected] # 5.18
Cc Carl Huang <[email protected]>
Signed-off-by Johan Hovold <[email protected]>
Acked-by Jeff Johnson <[email protected]>
Signed-off-by Kalle Valo <[email protected]>

Patch applied to ath-next branch of ath.git, thanks.

1dea3c0720a1 wifi: ath11k: fix gtk offload status event locking

Signature · 9 lines
https://patchwork.kernel.org/project/linux-wireless/patch/[email protected]/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


-- 
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k