Commit a081de17 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: mt7615: fix a possible NULL pointer dereference in mt7615_pm_wake_work 



Initialize wcid to global_wcid if msta is NULL in mt7615_pm_wake_work
routine since wcid will be dereferenced running mt76_tx()

Fixes: 2b8cdfb2 ("mt76: mt7615: wake device before pushing frames in mt7615_tx")
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent e862825d

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

+2 −1
Original line number Diff line number Diff line
@@ -1857,12 +1857,13 @@ void mt7615_pm_wake_work(struct work_struct *work) 
	spin_lock_bh(&dev->pm.txq_lock);

	for (i = 0; i < IEEE80211_NUM_ACS; i++) {

		struct mt7615_sta *msta = dev->pm.tx_q[i].msta;

		struct mt76_wcid *wcid = msta ? &msta->wcid : NULL;

		struct ieee80211_sta *sta = NULL;

		struct mt76_wcid *wcid;



		if (!dev->pm.tx_q[i].skb)

			continue;



		wcid = msta ? &msta->wcid : &dev->mt76.global_wcid;

		if (msta && wcid->sta)

			sta = container_of((void *)msta, struct ieee80211_sta,

					   drv_priv);