ath11k_core_start() waits for the service ready handshake, in which the firmware sends SERVICE_READY, SERVICE_READY_EXT and, if it supports it, SERVICE_READY_EXT2. Only the last of these events completes the wait, whenever its own TLVs parse, so the start goes on after an earlier event failed (for example, on -ENOMEM or a malformed TLV), with capabilities that were only partly extracted. An event that arrives again, even after the start, is handled again and rewrites the capabilities under a running driver. Track the next service ready event that this start accepts. Each handler takes only its own event in turn, closes the handshake before parsing and opens it for the next event only on success. A failed event then makes ath11k_wmi_wait_for_service_ready() time out, and any event out of turn, including one after the handshake completed, is ignored. Fixes: d5c65159f289 ("ath11k: driver for Qualcomm IEEE 802.11ax devices") Fixes: bd6478559e27 ("ath11k: Add direct buffer ring support") Cc: stable@vger.kernel.org # needs adjustments for <= 6.1 Signed-off-by: Zhao Li --- Found by code review. Tested in a QEMU guest with KASAN and a test hook that feeds service ready events to a synthetic device: without this change the start completed after a failed SERVICE_READY or SERVICE_READY_EXT, and duplicate or out-of-turn events were parsed again after the handshake; with it the failed start timed out and those events were dropped before parsing. No new W=1, sparse or smatch warnings. AI assistance was used. drivers/net/wireless/ath/ath11k/wmi.c | 22 +++++++++++++++++++++- drivers/net/wireless/ath/ath11k/wmi.h | 9 +++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c index 08fd6795ed9e..5f9b18338478 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -612,6 +612,11 @@ static int ath11k_service_ready_event(struct ath11k_base *ab, struct sk_buff *sk struct wmi_tlv_svc_ready_parse svc_ready = { }; int ret; + if (ab->wmi_ab.svc_rdy_next != ATH11K_WMI_SVC_RDY) + return -EPROTO; + + ab->wmi_ab.svc_rdy_next = ATH11K_WMI_SVC_RDY_NONE; + ret = ath11k_wmi_tlv_iter(ab, skb->data, skb->len, ath11k_wmi_tlv_svc_rdy_parse, &svc_ready); @@ -622,6 +627,8 @@ static int ath11k_service_ready_event(struct ath11k_base *ab, struct sk_buff *sk ath11k_dbg(ab, ATH11K_DBG_WMI, "event service ready"); + ab->wmi_ab.svc_rdy_next = ATH11K_WMI_SVC_RDY_EXT; + return 0; } @@ -5118,6 +5125,11 @@ static int ath11k_service_ready_ext_event(struct ath11k_base *ab, struct wmi_tlv_svc_rdy_ext_parse svc_rdy_ext = { }; int ret; + if (ab->wmi_ab.svc_rdy_next != ATH11K_WMI_SVC_RDY_EXT) + return -EPROTO; + + ab->wmi_ab.svc_rdy_next = ATH11K_WMI_SVC_RDY_NONE; + ret = ath11k_wmi_tlv_iter(ab, skb->data, skb->len, ath11k_wmi_tlv_svc_rdy_ext_parse, &svc_rdy_ext); @@ -5128,7 +5140,9 @@ static int ath11k_service_ready_ext_event(struct ath11k_base *ab, ath11k_dbg(ab, ATH11K_DBG_WMI, "event service ready ext"); - if (!test_bit(WMI_TLV_SERVICE_EXT2_MSG, ab->wmi_ab.svc_map)) + if (test_bit(WMI_TLV_SERVICE_EXT2_MSG, ab->wmi_ab.svc_map)) + ab->wmi_ab.svc_rdy_next = ATH11K_WMI_SVC_RDY_EXT2; + else complete(&ab->wmi_ab.service_ready); kfree(svc_rdy_ext.mac_phy_caps); @@ -5180,6 +5194,11 @@ static int ath11k_service_ready_ext2_event(struct ath11k_base *ab, struct wmi_tlv_svc_rdy_ext2_parse svc_rdy_ext2 = { }; int ret; + if (ab->wmi_ab.svc_rdy_next != ATH11K_WMI_SVC_RDY_EXT2) + return -EPROTO; + + ab->wmi_ab.svc_rdy_next = ATH11K_WMI_SVC_RDY_NONE; + ret = ath11k_wmi_tlv_iter(ab, skb->data, skb->len, ath11k_wmi_tlv_svc_rdy_ext2_parse, &svc_rdy_ext2); @@ -9315,6 +9334,7 @@ int ath11k_wmi_attach(struct ath11k_base *ab) /* TODO: Init remaining wmi soc resources required */ init_completion(&ab->wmi_ab.service_ready); init_completion(&ab->wmi_ab.unified_ready); + ab->wmi_ab.svc_rdy_next = ATH11K_WMI_SVC_RDY; return 0; } diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h index b2dade0516ac..c69037c8a114 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.h +++ b/drivers/net/wireless/ath/ath11k/wmi.h @@ -5849,6 +5849,13 @@ struct wmi_peer_sta_ps_state_chg_event { u32 peer_ps_timestamp; } __packed; +enum ath11k_wmi_svc_rdy { + ATH11K_WMI_SVC_RDY_NONE, + ATH11K_WMI_SVC_RDY, + ATH11K_WMI_SVC_RDY_EXT, + ATH11K_WMI_SVC_RDY_EXT2, +}; + struct ath11k_wmi_base { struct ath11k_base *ab; struct ath11k_pdev_wmi wmi[MAX_RADIOS]; @@ -5857,6 +5864,8 @@ struct ath11k_wmi_base { struct completion service_ready; struct completion unified_ready; + /* Next service ready event this start accepts */ + enum ath11k_wmi_svc_rdy svc_rdy_next; DECLARE_BITMAP(svc_map, WMI_MAX_EXT2_SERVICE); wait_queue_head_t tx_credits_wq; u32 num_mem_chunks; base-commit: b1ed5a45b994a6473ca1cf34f35a1bf87f1d8e2a -- 2.56.1