From: Shuah Khan <skhan@linuxfoundation.org>
To: nbd@nbd.name, lorenzo.bianconi83@gmail.com,
ryder.lee@mediatek.com, kvalo@codeaurora.org,
davem@davemloft.net, kuba@kernel.org, matthias.bgg@gmail.com
Cc: Shuah Khan <skhan@linuxfoundation.org>,
linux-wireless@vger.kernel.org, netdev@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH] mt76: hold RCU lock when calling ieee80211_find_sta_by_ifaddr()
Date: Thu, 11 Feb 2021 19:13:06 -0700 [thread overview]
Message-ID: <20210212021312.40486-1-skhan@linuxfoundation.org> (raw)
In-Reply-To: <1cfa036227cfa9fdd04316c01e1d754f13a70d9e.1613090339.git.skhan@linuxfoundation.org>
ieee80211_find_sta_by_ifaddr() must be called under the RCU lock and
the resulting pointer is only valid under RCU lock as well.
Fix mt76_check_sta() to hold RCU read lock before it calls
ieee80211_find_sta_by_ifaddr() and release it when the resulting
pointer is no longer needed.
This problem was found while reviewing code to debug RCU warn from
ath10k_wmi_tlv_parse_peer_stats_info() and a subsequent manual audit
of other callers of ieee80211_find_sta_by_ifaddr() that don't hold
RCU read lock.
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
---
- Note: This patch is compile tested. I don't have access to
hardware.
drivers/net/wireless/mediatek/mt76/mac80211.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index a840396f2c74..3c732da2a53f 100644
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -867,6 +867,9 @@ mt76_check_sta(struct mt76_dev *dev, struct sk_buff *skb)
bool ps;
hw = mt76_phy_hw(dev, status->ext_phy);
+
+ rcu_read_lock();
+
if (ieee80211_is_pspoll(hdr->frame_control) && !wcid) {
sta = ieee80211_find_sta_by_ifaddr(hw, hdr->addr2, NULL);
if (sta)
@@ -876,7 +879,7 @@ mt76_check_sta(struct mt76_dev *dev, struct sk_buff *skb)
mt76_airtime_check(dev, skb);
if (!wcid || !wcid->sta)
- return;
+ goto exit;
sta = container_of((void *)wcid, struct ieee80211_sta, drv_priv);
@@ -886,17 +889,17 @@ mt76_check_sta(struct mt76_dev *dev, struct sk_buff *skb)
wcid->inactive_count = 0;
if (!test_bit(MT_WCID_FLAG_CHECK_PS, &wcid->flags))
- return;
+ goto exit;
if (ieee80211_is_pspoll(hdr->frame_control)) {
ieee80211_sta_pspoll(sta);
- return;
+ goto exit;
}
if (ieee80211_has_morefrags(hdr->frame_control) ||
!(ieee80211_is_mgmt(hdr->frame_control) ||
ieee80211_is_data(hdr->frame_control)))
- return;
+ goto exit;
ps = ieee80211_has_pm(hdr->frame_control);
@@ -905,7 +908,7 @@ mt76_check_sta(struct mt76_dev *dev, struct sk_buff *skb)
ieee80211_sta_uapsd_trigger(sta, status->tid);
if (!!test_bit(MT_WCID_FLAG_PS, &wcid->flags) == ps)
- return;
+ goto exit;
if (ps)
set_bit(MT_WCID_FLAG_PS, &wcid->flags);
@@ -914,6 +917,9 @@ mt76_check_sta(struct mt76_dev *dev, struct sk_buff *skb)
dev->drv->sta_ps(dev, sta, ps);
ieee80211_sta_ps_transition(sta, ps);
+
+exit:
+ rcu_read_unlock();
}
void mt76_rx_complete(struct mt76_dev *dev, struct sk_buff_head *frames,
--
2.27.0
next prev parent reply other threads:[~2021-02-12 2:14 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <cover.1613090339.git.skhan@linuxfoundation.org>
2021-02-12 2:13 ` [PATCH 1/2] ath9k: hold RCU lock when calling ieee80211_find_sta_by_ifaddr() Shuah Khan
2021-02-12 2:13 ` Shuah Khan [this message]
2021-02-12 5:36 ` [PATCH] mt76: " Felix Fietkau
2021-02-12 17:20 ` Shuah Khan
2021-02-12 2:13 ` [PATCH] rtw88: " Shuah Khan
2021-02-12 6:34 ` Felix Fietkau
2021-02-12 6:31 ` [PATCH 1/2] ath9k: " Felix Fietkau
2021-02-12 2:13 ` [PATCH 2/2] ath9k: fix ath_tx_process_buffer() potential null ptr dereference Shuah Khan
2021-02-16 7:03 ` Kalle Valo
2021-02-16 7:53 ` Felix Fietkau
2021-02-16 15:22 ` Shuah Khan
2021-02-17 7:30 ` Kalle Valo
2021-02-17 14:56 ` Shuah Khan
2021-02-17 20:28 ` Shuah Khan
2021-02-17 21:36 ` Felix Fietkau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210212021312.40486-1-skhan@linuxfoundation.org \
--to=skhan@linuxfoundation.org \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=kvalo@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=lorenzo.bianconi83@gmail.com \
--cc=matthias.bgg@gmail.com \
--cc=nbd@nbd.name \
--cc=netdev@vger.kernel.org \
--cc=ryder.lee@mediatek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).