Commit 723885a6 authored by Sean Wang's avatar Sean Wang Committed by Felix Fietkau
Browse files

mt76: mt7921: fix the coredump is being truncated 



Fix the maximum size of the coredump generated with current mt7921
firmware. Otherwise, a truncated coredump would be reported to userland
via dev_coredumpv.

Also, there is an additional error handling enhanced in the patch to avoid
the possible invalid buffer access when the system failed to create the
buffer to hold the coredump.

Fixes: 0da3c795 ("mt76: mt7921: add coredump support")
Co-developed-by: default avatarYN Chen <YN.Chen@mediatek.com>
Signed-off-by: default avatarYN Chen <YN.Chen@mediatek.com>
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent 78b0328f

drivers/net/wireless/mediatek/mt76/mt76_connac.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#define MT76_CONNAC_MAX_SCAN_MATCH		16



#define MT76_CONNAC_COREDUMP_TIMEOUT		(HZ / 20)

#define MT76_CONNAC_COREDUMP_SZ			(128 * 1024)

#define MT76_CONNAC_COREDUMP_SZ			(1300 * 1024)



enum {

	CMD_CBW_20MHZ = IEEE80211_STA_RX_BW_20,

drivers/net/wireless/mediatek/mt76/mt7921/mac.c

+6 −3
Original line number Diff line number Diff line
@@ -1548,7 +1548,7 @@ void mt7921_coredump_work(struct work_struct *work) 
			break;



		skb_pull(skb, sizeof(struct mt7921_mcu_rxd));

		if (data + skb->len - dump > MT76_CONNAC_COREDUMP_SZ) {

		if (!dump || data + skb->len - dump > MT76_CONNAC_COREDUMP_SZ) {

			dev_kfree_skb(skb);

			continue;

		}
@@ -1558,7 +1558,10 @@ void mt7921_coredump_work(struct work_struct *work) 


		dev_kfree_skb(skb);

	}



	if (dump)

		dev_coredumpv(dev->mt76.dev, dump, MT76_CONNAC_COREDUMP_SZ,

			      GFP_KERNEL);



	mt7921_reset(&dev->mt76);

}