Skip to content

Commit f21f530

Browse files
pchelkin91gregkh
authored andcommitted
wifi: rtw89: fix use-after-free in rtw89_core_tx_kick_off_and_wait()
[ Upstream commit 3e31a6b ] There is a bug observed when rtw89_core_tx_kick_off_and_wait() tries to access already freed skb_data: BUG: KFENCE: use-after-free write in rtw89_core_tx_kick_off_and_wait drivers/net/wireless/realtek/rtw89/core.c:1110 CPU: 6 UID: 0 PID: 41377 Comm: kworker/u64:24 Not tainted 6.17.0-rc1+ #1 PREEMPT(lazy) Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS edk2-20250523-14.fc42 05/23/2025 Workqueue: events_unbound cfg80211_wiphy_work [cfg80211] Use-after-free write at 0x0000000020309d9d (in kfence-torvalds#251): rtw89_core_tx_kick_off_and_wait drivers/net/wireless/realtek/rtw89/core.c:1110 rtw89_core_scan_complete drivers/net/wireless/realtek/rtw89/core.c:5338 rtw89_hw_scan_complete_cb drivers/net/wireless/realtek/rtw89/fw.c:7979 rtw89_chanctx_proceed_cb drivers/net/wireless/realtek/rtw89/chan.c:3165 rtw89_chanctx_proceed drivers/net/wireless/realtek/rtw89/chan.h:141 rtw89_hw_scan_complete drivers/net/wireless/realtek/rtw89/fw.c:8012 rtw89_mac_c2h_scanofld_rsp drivers/net/wireless/realtek/rtw89/mac.c:5059 rtw89_fw_c2h_work drivers/net/wireless/realtek/rtw89/fw.c:6758 process_one_work kernel/workqueue.c:3241 worker_thread kernel/workqueue.c:3400 kthread kernel/kthread.c:463 ret_from_fork arch/x86/kernel/process.c:154 ret_from_fork_asm arch/x86/entry/entry_64.S:258 kfence-torvalds#251: 0x0000000056e2393d-0x000000009943cb62, size=232, cache=skbuff_head_cache allocated by task 41377 on cpu 6 at 77869.159548s (0.009551s ago): __alloc_skb net/core/skbuff.c:659 __netdev_alloc_skb net/core/skbuff.c:734 ieee80211_nullfunc_get net/mac80211/tx.c:5844 rtw89_core_send_nullfunc drivers/net/wireless/realtek/rtw89/core.c:3431 rtw89_core_scan_complete drivers/net/wireless/realtek/rtw89/core.c:5338 rtw89_hw_scan_complete_cb drivers/net/wireless/realtek/rtw89/fw.c:7979 rtw89_chanctx_proceed_cb drivers/net/wireless/realtek/rtw89/chan.c:3165 rtw89_chanctx_proceed drivers/net/wireless/realtek/rtw89/chan.c:3194 rtw89_hw_scan_complete drivers/net/wireless/realtek/rtw89/fw.c:8012 rtw89_mac_c2h_scanofld_rsp drivers/net/wireless/realtek/rtw89/mac.c:5059 rtw89_fw_c2h_work drivers/net/wireless/realtek/rtw89/fw.c:6758 process_one_work kernel/workqueue.c:3241 worker_thread kernel/workqueue.c:3400 kthread kernel/kthread.c:463 ret_from_fork arch/x86/kernel/process.c:154 ret_from_fork_asm arch/x86/entry/entry_64.S:258 freed by task 1045 on cpu 9 at 77869.168393s (0.001557s ago): ieee80211_tx_status_skb net/mac80211/status.c:1117 rtw89_pci_release_txwd_skb drivers/net/wireless/realtek/rtw89/pci.c:564 rtw89_pci_release_tx_skbs.isra.0 drivers/net/wireless/realtek/rtw89/pci.c:651 rtw89_pci_release_tx drivers/net/wireless/realtek/rtw89/pci.c:676 rtw89_pci_napi_poll drivers/net/wireless/realtek/rtw89/pci.c:4238 __napi_poll net/core/dev.c:7495 net_rx_action net/core/dev.c:7557 net/core/dev.c:7684 handle_softirqs kernel/softirq.c:580 do_softirq.part.0 kernel/softirq.c:480 __local_bh_enable_ip kernel/softirq.c:407 rtw89_pci_interrupt_threadfn drivers/net/wireless/realtek/rtw89/pci.c:927 irq_thread_fn kernel/irq/manage.c:1133 irq_thread kernel/irq/manage.c:1257 kthread kernel/kthread.c:463 ret_from_fork arch/x86/kernel/process.c:154 ret_from_fork_asm arch/x86/entry/entry_64.S:258 It is a consequence of a race between the waiting and the signaling side of the completion: Waiting thread Completing thread rtw89_core_tx_kick_off_and_wait() rcu_assign_pointer(skb_data->wait, wait) /* start waiting */ wait_for_completion_timeout() rtw89_pci_tx_status() rtw89_core_tx_wait_complete() rcu_read_lock() /* signals completion and * proceeds further */ complete(&wait->completion) rcu_read_unlock() ... /* frees skb_data */ ieee80211_tx_status_ni() /* returns (exit status doesn't matter) */ wait_for_completion_timeout() ... /* accesses the already freed skb_data */ rcu_assign_pointer(skb_data->wait, NULL) The completing side might proceed and free the underlying skb even before the waiting side is fully awoken and run to execution. Actually the race happens regardless of wait_for_completion_timeout() exit status, e.g. the waiting side may hit a timeout and the concurrent completing side is still able to free the skb. Skbs which are sent by rtw89_core_tx_kick_off_and_wait() are owned by the driver. They don't come from core ieee80211 stack so no need to pass them to ieee80211_tx_status_ni() on completing side. Introduce a work function which will act as a garbage collector for rtw89_tx_wait_info objects and the associated skbs. Thus no potentially heavy locks are required on the completing side. Found by Linux Verification Center (linuxtesting.org). Fixes: 1ae5ca6 ("wifi: rtw89: add function to wait for completion of TX skbs") Cc: stable@vger.kernel.org Suggested-by: Zong-Zhe Yang <kevin_yang@realtek.com> Signed-off-by: Fedor Pchelkin <pchelkin@ispras.ru> Acked-by: Ping-Ke Shih <pkshih@realtek.com> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com> Link: https://patch.msgid.link/20250919210852.823912-2-pchelkin@ispras.ru Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 23b3c59 commit f21f530

File tree

4 files changed

+61
-9
lines changed

4 files changed

+61
-9
lines changed

drivers/net/wireless/realtek/rtw89/core.c

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1050,6 +1050,14 @@ rtw89_core_tx_update_desc_info(struct rtw89_dev *rtwdev,
10501050
}
10511051
}
10521052

1053+
static void rtw89_tx_wait_work(struct wiphy *wiphy, struct wiphy_work *work)
1054+
{
1055+
struct rtw89_dev *rtwdev = container_of(work, struct rtw89_dev,
1056+
tx_wait_work.work);
1057+
1058+
rtw89_tx_wait_list_clear(rtwdev);
1059+
}
1060+
10531061
void rtw89_core_tx_kick_off(struct rtw89_dev *rtwdev, u8 qsel)
10541062
{
10551063
u8 ch_dma;
@@ -1067,25 +1075,32 @@ int rtw89_core_tx_kick_off_and_wait(struct rtw89_dev *rtwdev, struct sk_buff *sk
10671075
unsigned long time_left;
10681076
int ret = 0;
10691077

1078+
lockdep_assert_wiphy(rtwdev->hw->wiphy);
1079+
10701080
wait = kzalloc(sizeof(*wait), GFP_KERNEL);
10711081
if (!wait) {
10721082
rtw89_core_tx_kick_off(rtwdev, qsel);
10731083
return 0;
10741084
}
10751085

10761086
init_completion(&wait->completion);
1087+
wait->skb = skb;
10771088
rcu_assign_pointer(skb_data->wait, wait);
10781089

10791090
rtw89_core_tx_kick_off(rtwdev, qsel);
10801091
time_left = wait_for_completion_timeout(&wait->completion,
10811092
msecs_to_jiffies(timeout));
1082-
if (time_left == 0)
1083-
ret = -ETIMEDOUT;
1084-
else if (!wait->tx_done)
1085-
ret = -EAGAIN;
10861093

1087-
rcu_assign_pointer(skb_data->wait, NULL);
1088-
kfree_rcu(wait, rcu_head);
1094+
if (time_left == 0) {
1095+
ret = -ETIMEDOUT;
1096+
list_add_tail(&wait->list, &rtwdev->tx_waits);
1097+
wiphy_delayed_work_queue(rtwdev->hw->wiphy, &rtwdev->tx_wait_work,
1098+
RTW89_TX_WAIT_WORK_TIMEOUT);
1099+
} else {
1100+
if (!wait->tx_done)
1101+
ret = -EAGAIN;
1102+
rtw89_tx_wait_release(wait);
1103+
}
10891104

10901105
return ret;
10911106
}
@@ -4810,6 +4825,7 @@ void rtw89_core_stop(struct rtw89_dev *rtwdev)
48104825
wiphy_work_cancel(wiphy, &btc->dhcp_notify_work);
48114826
wiphy_work_cancel(wiphy, &btc->icmp_notify_work);
48124827
cancel_delayed_work_sync(&rtwdev->txq_reinvoke_work);
4828+
wiphy_delayed_work_cancel(wiphy, &rtwdev->tx_wait_work);
48134829
wiphy_delayed_work_cancel(wiphy, &rtwdev->track_work);
48144830
wiphy_delayed_work_cancel(wiphy, &rtwdev->chanctx_work);
48154831
wiphy_delayed_work_cancel(wiphy, &rtwdev->coex_act1_work);
@@ -5034,6 +5050,7 @@ int rtw89_core_init(struct rtw89_dev *rtwdev)
50345050
INIT_LIST_HEAD(&rtwdev->scan_info.pkt_list[band]);
50355051
}
50365052
INIT_LIST_HEAD(&rtwdev->scan_info.chan_list);
5053+
INIT_LIST_HEAD(&rtwdev->tx_waits);
50375054
INIT_WORK(&rtwdev->ba_work, rtw89_core_ba_work);
50385055
INIT_WORK(&rtwdev->txq_work, rtw89_core_txq_work);
50395056
INIT_DELAYED_WORK(&rtwdev->txq_reinvoke_work, rtw89_core_txq_reinvoke_work);
@@ -5044,6 +5061,7 @@ int rtw89_core_init(struct rtw89_dev *rtwdev)
50445061
wiphy_delayed_work_init(&rtwdev->coex_rfk_chk_work, rtw89_coex_rfk_chk_work);
50455062
wiphy_delayed_work_init(&rtwdev->cfo_track_work, rtw89_phy_cfo_track_work);
50465063
wiphy_delayed_work_init(&rtwdev->mcc_prepare_done_work, rtw89_mcc_prepare_done_work);
5064+
wiphy_delayed_work_init(&rtwdev->tx_wait_work, rtw89_tx_wait_work);
50475065
INIT_DELAYED_WORK(&rtwdev->forbid_ba_work, rtw89_forbid_ba_work);
50485066
wiphy_delayed_work_init(&rtwdev->antdiv_work, rtw89_phy_antdiv_work);
50495067
rtwdev->txq_wq = alloc_workqueue("rtw89_tx_wq", WQ_UNBOUND | WQ_HIGHPRI, 0);

drivers/net/wireless/realtek/rtw89/core.h

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3429,9 +3429,12 @@ struct rtw89_phy_rate_pattern {
34293429
bool enable;
34303430
};
34313431

3432+
#define RTW89_TX_WAIT_WORK_TIMEOUT msecs_to_jiffies(500)
34323433
struct rtw89_tx_wait_info {
34333434
struct rcu_head rcu_head;
3435+
struct list_head list;
34343436
struct completion completion;
3437+
struct sk_buff *skb;
34353438
bool tx_done;
34363439
};
34373440

@@ -5802,6 +5805,9 @@ struct rtw89_dev {
58025805
/* used to protect rpwm */
58035806
spinlock_t rpwm_lock;
58045807

5808+
struct list_head tx_waits;
5809+
struct wiphy_delayed_work tx_wait_work;
5810+
58055811
struct rtw89_cam_info cam_info;
58065812

58075813
struct sk_buff_head c2h_queue;
@@ -6056,6 +6062,26 @@ rtw89_assoc_link_rcu_dereference(struct rtw89_dev *rtwdev, u8 macid)
60566062
list_first_entry_or_null(&p->dlink_pool, typeof(*p->links_inst), dlink_schd); \
60576063
})
60586064

6065+
static inline void rtw89_tx_wait_release(struct rtw89_tx_wait_info *wait)
6066+
{
6067+
dev_kfree_skb_any(wait->skb);
6068+
kfree_rcu(wait, rcu_head);
6069+
}
6070+
6071+
static inline void rtw89_tx_wait_list_clear(struct rtw89_dev *rtwdev)
6072+
{
6073+
struct rtw89_tx_wait_info *wait, *tmp;
6074+
6075+
lockdep_assert_wiphy(rtwdev->hw->wiphy);
6076+
6077+
list_for_each_entry_safe(wait, tmp, &rtwdev->tx_waits, list) {
6078+
if (!completion_done(&wait->completion))
6079+
continue;
6080+
list_del(&wait->list);
6081+
rtw89_tx_wait_release(wait);
6082+
}
6083+
}
6084+
60596085
static inline int rtw89_hci_tx_write(struct rtw89_dev *rtwdev,
60606086
struct rtw89_core_tx_request *tx_req)
60616087
{
@@ -6065,6 +6091,7 @@ static inline int rtw89_hci_tx_write(struct rtw89_dev *rtwdev,
60656091
static inline void rtw89_hci_reset(struct rtw89_dev *rtwdev)
60666092
{
60676093
rtwdev->hci.ops->reset(rtwdev);
6094+
rtw89_tx_wait_list_clear(rtwdev);
60686095
}
60696096

60706097
static inline int rtw89_hci_start(struct rtw89_dev *rtwdev)
@@ -7122,23 +7149,27 @@ static inline struct sk_buff *rtw89_alloc_skb_for_rx(struct rtw89_dev *rtwdev,
71227149
return dev_alloc_skb(length);
71237150
}
71247151

7125-
static inline void rtw89_core_tx_wait_complete(struct rtw89_dev *rtwdev,
7152+
static inline bool rtw89_core_tx_wait_complete(struct rtw89_dev *rtwdev,
71267153
struct rtw89_tx_skb_data *skb_data,
71277154
bool tx_done)
71287155
{
71297156
struct rtw89_tx_wait_info *wait;
7157+
bool ret = false;
71307158

71317159
rcu_read_lock();
71327160

71337161
wait = rcu_dereference(skb_data->wait);
71347162
if (!wait)
71357163
goto out;
71367164

7165+
ret = true;
71377166
wait->tx_done = tx_done;
7138-
complete(&wait->completion);
7167+
/* Don't access skb anymore after completion */
7168+
complete_all(&wait->completion);
71397169

71407170
out:
71417171
rcu_read_unlock();
7172+
return ret;
71427173
}
71437174

71447175
static inline bool rtw89_is_mlo_1_1(struct rtw89_dev *rtwdev)

drivers/net/wireless/realtek/rtw89/pci.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,8 @@ static void rtw89_pci_tx_status(struct rtw89_dev *rtwdev,
464464
struct rtw89_tx_skb_data *skb_data = RTW89_TX_SKB_CB(skb);
465465
struct ieee80211_tx_info *info;
466466

467-
rtw89_core_tx_wait_complete(rtwdev, skb_data, tx_status == RTW89_TX_DONE);
467+
if (rtw89_core_tx_wait_complete(rtwdev, skb_data, tx_status == RTW89_TX_DONE))
468+
return;
468469

469470
info = IEEE80211_SKB_CB(skb);
470471
ieee80211_tx_info_clear_status(info);

drivers/net/wireless/realtek/rtw89/ser.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,9 @@ static void ser_reset_trx_st_hdl(struct rtw89_ser *ser, u8 evt)
501501
}
502502

503503
drv_stop_rx(ser);
504+
wiphy_lock(wiphy);
504505
drv_trx_reset(ser);
506+
wiphy_unlock(wiphy);
505507

506508
/* wait m3 */
507509
hal_send_m2_event(ser);

0 commit comments

Comments
 (0)