2020-02-21 09:46:57

by Johannes Berg

Subject: [PATCH] mac80211: check vif pointer before airtime calculation

From: Johannes Berg <[email protected]>

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

Signed-off-by: Johannes Berg <[email protected]>
---
net/mac80211/tx.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 38f20a370f2a..8dd93072f6e6 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -5,7 +5,7 @@
* Copyright 2006-2007 Jiri Benc <[email protected]>
* Copyright 2007 Johannes Berg <[email protected]>
* 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 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw,
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,
--
2.24.1

2020-02-21 10:49:02

by Toke Høiland-Jørgensen

Subject: Re: [PATCH] mac80211: check vif pointer before airtime calculation

Johannes Berg <[email protected]> writes:

> From: Johannes Berg <[email protected]>
>
> In case of monitor mode injection, vif may be NULL, don't crash
> on that in ieee80211_calc_expected_tx_airtime().
>
> Signed-off-by: Johannes Berg <[email protected]>

Acked-by: Toke Høiland-Jørgensen <[email protected]>