On 10/23/23 11:17, Johannes Berg wrote:
On Mon, 2023-10-23 at 10:57 -0700, greearb@xxxxxxxxxxxxxxx wrote:
From: Ben Greear <greearb@xxxxxxxxxxxxxxx>
Protect from NULL ifmgd->assoc_data in ieee80211_mgd_deauth, crash
was seen here fairly often in a 32-station test case utilizing
mtk7922 and be200 radios. I'm not sure if radio types matters
though.
Signed-off-by: Ben Greear <greearb@xxxxxxxxxxxxxxx>
---
Patch is for wireless-next tree, bug was likely introduced in
this release since this crash was not seen in earlier 6.6-rc testing
nor in 6.5 or earlier.
There may be a better way to fix this...
I mean, you're not *actually* suggesting we merge this patch, right?
Right?!
No, but it is easier to explain backtraces when you can see the code that
generated it.
+++ b/net/mac80211/mlme.c
@@ -8185,13 +8185,18 @@ int ieee80211_mgd_deauth(struct ieee80211_sub_if_data *sdata,
I don't know what you did there, but that file doesn't even have 8k
lines for me.
The bug appears to have come in with this patch that I grabbed from linux-wireless
mailing list:
[greearb@ben-dt5 linux-6.6-wn.dev.y]$ git show 4600547c01ef7
commit 4600547c01ef728113253c6df9367eb4ed75193c
Author: Miri Korenblit <miriam.rachel.korenblit@xxxxxxxxx>
Date: Thu Sep 28 17:35:34 2023 +0300
wifi: mac80211: add link id to mgd_prepare_tx()
As we are moving to MLO and links terms, also the airtime protection
will be done for a link rather than for a vif. Thus, some
drivers will need to know for which link to protect airtime.
Add link id as a parameter to the mgd_prepare_tx() callback.
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@xxxxxxxxx>
Signed-off-by: Gregory Greenman <gregory.greenman@xxxxxxxxx>
I see no response to it on linux-wireless mailing list. I applied the
series locally since it preceded other iwlwifi related patches that
I wanted to test.
"aborting authentication with %pM by local choice (Reason: %u=%s)\n",
req->bssid, req->reason_code,
ieee80211_get_reason_code_string(req->reason_code));
So let me get this straight ... this is the "aborting authentication"
(!) case, but
-
- info.link_id = ifmgd->assoc_data->assoc_link_id;
your code is accessing the assoc_data? I'm not surprised that crashes,
but that's in no way what the upstream code looks like?
So proper fix (assuming Miri's patch is applied at all) is to just not
assign link-id in this specific case?
Also, there was a WARN_ON from net/wireless/mlme.c that was triggered just
after my splat, from the method below.
eca7b7121795 (Johannes Berg 2013-05-16 00:55:45 +0200 128) static void cfg80211_process_disassoc(struct wireless_dev *wdev,
3bb02143ff55f (Johannes Berg 2020-12-06 14:54:42 +0200 129) const u8 *buf, size_t len,
3bb02143ff55f (Johannes Berg 2020-12-06 14:54:42 +0200 130) bool reconnect)
6039f6d23fe79 (Jouni Malinen 2009-03-19 13:39:21 +0200 131) {
f26cbf401be93 (Zhao, Gang 2014-04-21 12:53:03 +0800 132) struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy);
6829c878ecd24 (Johannes Berg 2009-07-02 09:13:27 +0200 133) struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)buf;
19957bb399e27 (Johannes Berg 2009-07-02 17:20:43 +0200 134) const u8 *bssid = mgmt->bssid;
ceca7b7121795 (Johannes Berg 2013-05-16 00:55:45 +0200 135) u16 reason_code = le16_to_cpu(mgmt->u.disassoc.reason_code);
ceca7b7121795 (Johannes Berg 2013-05-16 00:55:45 +0200 136) bool from_ap = !ether_addr_equal(mgmt->sa, wdev->netdev->dev_addr);
6829c878ecd24 (Johannes Berg 2009-07-02 09:13:27 +0200 137)
3bb02143ff55f (Johannes Berg 2020-12-06 14:54:42 +0200 138) nl80211_send_disassoc(rdev, wdev->netdev, buf, len, reconnect,
3bb02143ff55f (Johannes Berg 2020-12-06 14:54:42 +0200 139) GFP_KERNEL);
a3b8b0569fbef (Jouni Malinen 2009-03-27 21:59:49 +0200 140)
7b0a0e3c3a882 (Johannes Berg 2022-04-14 16:50:57 +0200 141) if (WARN_ON(!wdev->connected ||
7b0a0e3c3a882 (Johannes Berg 2022-04-14 16:50:57 +0200 142) !ether_addr_equal(wdev->u.client.connected_addr, bssid)))
596a07c18b35c (Johannes Berg 2009-07-11 00:17:32 +0200 143) return;
6829c878ecd24 (Johannes Berg 2009-07-02 09:13:27 +0200 144)
ceca7b7121795 (Johannes Berg 2013-05-16 00:55:45 +0200 145) __cfg80211_disconnected(wdev->netdev, NULL, 0, reason_code, from_ap);
ceca7b7121795 (Johannes Berg 2013-05-16 00:55:45 +0200 146) cfg80211_sme_disassoc(wdev);
667503ddcb96f (Johannes Berg 2009-07-07 03:56:11 +0200 147) }
And of course it is always possible some other patch I've applied or created is actually
triggering this problem.
+ if (WARN_ON_ONCE((unsigned long)(ifmgd) < 4000 ||
+ (unsigned long)(ifmgd->assoc_data) < 4000)) {
You complain that it takes effort to get stuff upstream, but at the same
time this is what you post - you can't have really bad patches and a
fast track into upstream at the same time...
Of course I don't expect every patch to go upstream effortlessly.
But there is also the case where a patch may be technically OK, and useful
to me, but it is not an API or feature that the driver/stack maintainer
cares about, so it is ignored. Regarding my previous patch to fix a
crash, I'm not going to spend my time renaming
variables on the off chance that you'd like the patch vs just fixing the
specific broken code and moving on to other tasks. Since you known your
own mind, you could rename variables in 2 minutes, post the patch, and
you'd be done.
Thanks,
Ben
--
Ben Greear <greearb@xxxxxxxxxxxxxxx>
Candela Technologies Inc http://www.candelatech.com
