Skip to content

Commit e15d84b

Browse files
Manikanta PubbisettyJeff Johnson
authored andcommitted
wifi: ath10k: Fix memory leak in management tx
In the current logic, memory is allocated for storing the MSDU context during management packet TX but this memory is not being freed during management TX completion. Similar leaks are seen in the management TX cleanup logic. Kmemleak reports this problem as below, unreferenced object 0xffffff80b64ed250 (size 16): comm "kworker/u16:7", pid 148, jiffies 4294687130 (age 714.199s) hex dump (first 16 bytes): 00 2b d8 d8 80 ff ff ff c4 74 e9 fd 07 00 00 00 .+.......t...... backtrace: [<ffffffe6e7b245dc>] __kmem_cache_alloc_node+0x1e4/0x2d8 [<ffffffe6e7adde88>] kmalloc_trace+0x48/0x110 [<ffffffe6bbd765fc>] ath10k_wmi_tlv_op_gen_mgmt_tx_send+0xd4/0x1d8 [ath10k_core] [<ffffffe6bbd3eed4>] ath10k_mgmt_over_wmi_tx_work+0x134/0x298 [ath10k_core] [<ffffffe6e78d5974>] process_scheduled_works+0x1ac/0x400 [<ffffffe6e78d60b8>] worker_thread+0x208/0x328 [<ffffffe6e78dc890>] kthread+0x100/0x1c0 [<ffffffe6e78166c0>] ret_from_fork+0x10/0x20 Free the memory during completion and cleanup to fix the leak. Protect the mgmt_pending_tx idr_remove() operation in ath10k_wmi_tlv_op_cleanup_mgmt_tx_send() using ar->data_lock similar to other instances. Tested-on: WCN3990 hw1.0 SNOC WLAN.HL.2.0-01387-QCAHLSWMTPLZ-1 Fixes: dc40515 ("ath10k: handle mgmt tx completion event") Fixes: c730c47 ("ath10k: Remove msdu from idr when management pkt send fails") Cc: [email protected] Signed-off-by: Manikanta Pubbisetty <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jeff Johnson <[email protected]>
1 parent 2f833e8 commit e15d84b

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

drivers/net/wireless/ath/ath10k/wmi-tlv.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3043,9 +3043,14 @@ ath10k_wmi_tlv_op_cleanup_mgmt_tx_send(struct ath10k *ar,
30433043
struct sk_buff *msdu)
30443044
{
30453045
struct ath10k_skb_cb *cb = ATH10K_SKB_CB(msdu);
3046+
struct ath10k_mgmt_tx_pkt_addr *pkt_addr;
30463047
struct ath10k_wmi *wmi = &ar->wmi;
30473048

3048-
idr_remove(&wmi->mgmt_pending_tx, cb->msdu_id);
3049+
spin_lock_bh(&ar->data_lock);
3050+
pkt_addr = idr_remove(&wmi->mgmt_pending_tx, cb->msdu_id);
3051+
spin_unlock_bh(&ar->data_lock);
3052+
3053+
kfree(pkt_addr);
30493054

30503055
return 0;
30513056
}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2441,6 +2441,7 @@ wmi_process_mgmt_tx_comp(struct ath10k *ar, struct mgmt_tx_compl_params *param)
24412441
dma_unmap_single(ar->dev, pkt_addr->paddr,
24422442
msdu->len, DMA_TO_DEVICE);
24432443
info = IEEE80211_SKB_CB(msdu);
2444+
kfree(pkt_addr);
24442445

24452446
if (param->status) {
24462447
info->flags &= ~IEEE80211_TX_STAT_ACK;
@@ -9612,6 +9613,7 @@ static int ath10k_wmi_mgmt_tx_clean_up_pending(int msdu_id, void *ptr,
96129613
dma_unmap_single(ar->dev, pkt_addr->paddr,
96139614
msdu->len, DMA_TO_DEVICE);
96149615
ieee80211_free_txskb(ar->hw, msdu);
9616+
kfree(pkt_addr);
96159617

96169618
return 0;
96179619
}

0 commit comments

Comments
 (0)