Commit 4a52d6ab authored by Colin Ian King's avatar Colin Ian King Committed by Felix Fietkau
Browse files

mt76: mt7615: Fix a dereference of pointer sta before it is null checked 



Currently the assignment of idx dereferences pointer sta before
sta is null checked, leading to a potential null pointer dereference.
Fix this by assigning idx when it is required after the null check on
pointer sta.

Addresses-Coverity: ("Dereference before null check")
Fixes: a4a5a430 ("mt76: mt7615: fix TSF configuration")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent dc5d5f9d

drivers/net/wireless/mediatek/mt76/mt7615/usb_sdio.c

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int mt7663_usb_sdio_set_rates(struct mt7615_dev *dev, 
	struct mt7615_rate_desc *rate = &wrd->rate;

	struct mt7615_sta *sta = wrd->sta;

	u32 w5, w27, addr, val;

	u16 idx = sta->vif->mt76.omac_idx;

	u16 idx;



	lockdep_assert_held(&dev->mt76.mutex);
@@ -119,6 +119,7 @@ static int mt7663_usb_sdio_set_rates(struct mt7615_dev *dev, 


	sta->rate_probe = sta->rateset[rate->rateset].probe_rate.idx != -1;



	idx = sta->vif->mt76.omac_idx;

	idx = idx > HW_BSSID_MAX ? HW_BSSID_0 : idx;

	addr = idx > 1 ? MT_LPON_TCR2(idx): MT_LPON_TCR0(idx);