]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: ath10k: fix lock protection in ath10k_wmi_event_peer_sta_ps_state_chg()
authorZiyi Guo <n7l8m4@u.northwestern.edu>
Fri, 23 Jan 2026 17:56:11 +0000 (17:56 +0000)
committerJeff Johnson <jeff.johnson@oss.qualcomm.com>
Fri, 30 Jan 2026 15:12:36 +0000 (07:12 -0800)
ath10k_wmi_event_peer_sta_ps_state_chg() uses lockdep_assert_held() to
assert that ar->data_lock should be held by the caller, but neither
ath10k_wmi_10_2_op_rx() nor ath10k_wmi_10_4_op_rx() acquire this lock
before calling this function.

The field arsta->peer_ps_state is documented as protected by
ar->data_lock in core.h, and other accessors (ath10k_peer_ps_state_disable,
ath10k_dbg_sta_read_peer_ps_state) properly acquire this lock.

Add spin_lock_bh()/spin_unlock_bh() around the peer_ps_state update,
and remove the lockdep_assert_held() to be aligned with new locking,
following the pattern used by other WMI event handlers in the driver.

Signed-off-by: Ziyi Guo <n7l8m4@u.northwestern.edu>
Reviewed-by: Baochen Qiang <baochen.qiang@oss.qualcomm.com>
Link: https://patch.msgid.link/20260123175611.767731-1-n7l8m4@u.northwestern.edu
[removed excess blank line]
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
drivers/net/wireless/ath/ath10k/wmi.c

index b4aad6604d6d9d95b918d0a077f5d1511bc249ad..ce22141e5efd9ed2ca32f81b322b30a1b32595ca 100644 (file)
@@ -5289,8 +5289,6 @@ ath10k_wmi_event_peer_sta_ps_state_chg(struct ath10k *ar, struct sk_buff *skb)
        struct ath10k_sta *arsta;
        u8 peer_addr[ETH_ALEN];
 
-       lockdep_assert_held(&ar->data_lock);
-
        ev = (struct wmi_peer_sta_ps_state_chg_event *)skb->data;
        ether_addr_copy(peer_addr, ev->peer_macaddr.addr);
 
@@ -5305,7 +5303,9 @@ ath10k_wmi_event_peer_sta_ps_state_chg(struct ath10k *ar, struct sk_buff *skb)
        }
 
        arsta = (struct ath10k_sta *)sta->drv_priv;
+       spin_lock_bh(&ar->data_lock);
        arsta->peer_ps_state = __le32_to_cpu(ev->peer_ps_state);
+       spin_unlock_bh(&ar->data_lock);
 
 exit:
        rcu_read_unlock();