Skip to content

Commit f24292e

Browse files
pchelkin91kvalo
authored andcommitted
wifi: ath9k: avoid referencing uninit memory in ath9k_wmi_ctrl_rx
For the reasons also described in commit b383e8a ("wifi: ath9k: avoid uninit memory read in ath9k_htc_rx_msg()"), ath9k_htc_rx_msg() should validate pkt_len before accessing the SKB. For example, the obtained SKB may have been badly constructed with pkt_len = 8. In this case, the SKB can only contain a valid htc_frame_hdr but after being processed in ath9k_htc_rx_msg() and passed to ath9k_wmi_ctrl_rx() endpoint RX handler, it is expected to have a WMI command header which should be located inside its data payload. Implement sanity checking inside ath9k_wmi_ctrl_rx(). Otherwise, uninit memory can be referenced. Tested on Qualcomm Atheros Communications AR9271 802.11n . Found by Linux Verification Center (linuxtesting.org) with Syzkaller. Fixes: fb9987d ("ath9k_htc: Support for AR9271 chipset.") Reported-and-tested-by: syzbot+f2cb6e0ffdb961921e4d@syzkaller.appspotmail.com Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru> Acked-by: Toke Høiland-Jørgensen <toke@toke.dk> Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Link: https://lore.kernel.org/r/20230424183348.111355-1-pchelkin@ispras.ru
1 parent 3e56c80 commit f24292e

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

  • drivers/net/wireless/ath/ath9k

drivers/net/wireless/ath/ath9k/wmi.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,10 @@ static void ath9k_wmi_ctrl_rx(void *priv, struct sk_buff *skb,
221221
if (unlikely(wmi->stopped))
222222
goto free_skb;
223223

224+
/* Validate the obtained SKB. */
225+
if (unlikely(skb->len < sizeof(struct wmi_cmd_hdr)))
226+
goto free_skb;
227+
224228
hdr = (struct wmi_cmd_hdr *) skb->data;
225229
cmd_id = be16_to_cpu(hdr->command_id);
226230

0 commit comments

Comments
 (0)