2021-07-22 20:29:07

by Ben Greear

[permalink] [raw]
Subject: [PATCH v2 02/11] mt76 - mt7915: Fix potential NPE in TXS processing.

From: Ben Greear <[email protected]>

If skb is null, then don't try to dereference it.

Signed-off-by: Ben Greear <[email protected]>
---
drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index 555a2f94d069..fb88332f19ef 100644
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -1321,7 +1321,7 @@ mt7915_mac_add_txs_skb(struct mt7915_dev *dev, struct mt76_wcid *wcid, int pid,

/* TODO: Gather stats anyway, even if we are not matching on an skb. */
if (!skb)
- goto out;
+ goto out_no_skb;

txs = le32_to_cpu(txs_data[0]);
txs5 = le32_to_cpu(txs_data[5]);
@@ -1427,6 +1427,8 @@ mt7915_mac_add_txs_skb(struct mt7915_dev *dev, struct mt76_wcid *wcid, int pid,

out:
mt76_tx_status_skb_done(mdev, skb, &list, wcid);
+
+out_no_skb:
mt76_tx_status_unlock(mdev, &list);

return !!skb;
--
2.20.1