Commit fdcecd92 authored by Toke Høiland-Jørgensen's avatar Toke Høiland-Jørgensen Committed by Dong Chenchen
Browse files

wifi: ath9k: delay all of ath9k_wmi_event_tasklet() until init is complete

mainline inclusion
from mainline-v6.9-rc1
commit 24355fcb0d4cbcb6ddda262596558e8cfba70f11
category: bugfix
bugzilla: 189830, https://gitee.com/src-openeuler/kernel/issues/I9HK6T
CVE: CVE-2024-26897

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=24355fcb0d4cbcb6ddda262596558e8cfba70f11

--------------------------------

The ath9k_wmi_event_tasklet() used in ath9k_htc assumes that all the data
structures have been fully initialised by the time it runs. However, because of
the order in which things are initialised, this is not guaranteed to be the
case, because the device is exposed to the USB subsystem before the ath9k driver
initialisation is completed.

We already committed a partial fix for this in commit:
8b3046ab ("ath9k_htc: fix NULL pointer dereference at ath9k_htc_tx_get_packet()")

However, that commit only aborted the WMI_TXSTATUS_EVENTID command in the event
tasklet, pairing it with an "initialisation complete" bit in the TX struct. It
seems syzbot managed to trigger the race for one of the other commands as well,
so let's just move the existing synchronisation bit to cover the whole
tasklet (setting it at the end of ath9k_htc_probe_device() instead of inside
ath9k_tx_init()).

Link: https://lore.kernel.org/r/ed1d2c66-1193-4c81-9542-d514c29ba8b8.bugreport@ubisectech.com


Fixes: 8b3046ab ("ath9k_htc: fix NULL pointer dereference at ath9k_htc_tx_get_packet()")
Reported-by: default avatarUbisectech Sirius <bugreport@ubisectech.com>
Signed-off-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: default avatarKalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20240126140218.1033443-1-toke@toke.dk


Conflicts:
        drivers/net/wireless/ath/ath9k/wmi.c
[current version doesnt contain macro data_race()]
Signed-off-by: default avatarDong Chenchen <dongchenchen2@huawei.com>
parent 5745b3da
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment