mac80211: check vif pointer before airtime calculation (ca98c47d) · Commits · 戴 / test

In case of monitor mode injection, vif may be NULL, don't crash on that in ieee80211_calc_expected_tx_airtime(). Signed-off-by:

net/mac80211/tx.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@
		* Copyright 2006-2007 Jiri Benc <jbenc@suse.cz>
		* Copyright 2007 Johannes Berg <johannes@sipsolutions.net>
		* Copyright 2013-2014 Intel Mobile Communications GmbH
		* Copyright (C) 2018 Intel Corporation
		* Copyright (C) 2018-2020 Intel Corporation
		*
		* Transmit and frame generation functions.
		*/
		@@ -3682,7 +3682,8 @@ begin:
		encap_out:
		IEEE80211_SKB_CB(skb)->control.vif = vif;

		if (wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) {
		if (vif &&
		wiphy_ext_feature_isset(local->hw.wiphy, NL80211_EXT_FEATURE_AQL)) {
		u32 airtime;

		airtime = ieee80211_calc_expected_tx_airtime(hw, vif, txq->sta,