Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6db6340c authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: add missing rcu_read_lock 



Using ieee80211_find_sta() needs to be under
RCU read lock, which iwlwifi currently misses,
so fix it.

Cc: stable@kernel.org
Reported-by: default avatarMiles Lane <miles.lane@gmail.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Acked-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Tested-by: default avatarMiles Lane <miles.lane@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 35dd0509

drivers/net/wireless/iwlwifi/iwl-agn-tx.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1125,6 +1125,7 @@ static void iwlagn_tx_status(struct iwl_priv *priv, struct sk_buff *skb) 
	struct ieee80211_sta *sta;

	struct ieee80211_sta *sta;

	struct iwl_station_priv *sta_priv;

	struct iwl_station_priv *sta_priv;





	rcu_read_lock();

	sta = ieee80211_find_sta(priv->vif, hdr->addr1);

	sta = ieee80211_find_sta(priv->vif, hdr->addr1);

	if (sta) {

	if (sta) {

		sta_priv = (void *)sta->drv_priv;

		sta_priv = (void *)sta->drv_priv;
@@ -1133,6 +1134,7 @@ static void iwlagn_tx_status(struct iwl_priv *priv, struct sk_buff *skb) 
		    atomic_dec_return(&sta_priv->pending_frames) == 0)

		    atomic_dec_return(&sta_priv->pending_frames) == 0)

			ieee80211_sta_block_awake(priv->hw, sta, false);

			ieee80211_sta_block_awake(priv->hw, sta, false);

	}

	}

	rcu_read_unlock();





	ieee80211_tx_status_irqsafe(priv->hw, skb);

	ieee80211_tx_status_irqsafe(priv->hw, skb);

}

}