From nobody Mon Feb 9 23:43:09 2026 Received: from mail-dy1-f181.google.com (mail-dy1-f181.google.com [74.125.82.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 342041A3178 for ; Thu, 29 Jan 2026 08:46:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769676379; cv=none; b=KJMlxbb1Xb5a7PsMgdvn2ulYGdEq6ICF/DVt5H+8iWN0WtXsAXsYulnT2G6cOYSJMFMj+cYEI+WnUVfDsqof8dhIIZajX2+JH/oygcs/fL2iHKRFW6XXJCJ8Nd5GM6BaTW47ljwhfviws0n0PTHfTKxyNpIc9wTpldBym8HOIzY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769676379; c=relaxed/simple; bh=vMdGwC/qf+2O0zngrxjCurOPxiTpRuxWh6CV3arQQd8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=V06StF4jJYIV+RSEASTUQ1KcpHvDlhdLvRwWHKEFg7kw5yqKt133C9MGqMxoBa2T+hpFoFVR1qJYdTx4yryn0d+l3l4Zi/SRVggiMtJzE5yMbws0850taL4du5s64U1eyJFf0NkFTg0AlUNh17GhcaHsofifWSqnqfC3tHHjPuc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=zacbowling.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=in+aMamY; arc=none smtp.client-ip=74.125.82.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=zacbowling.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="in+aMamY" Received: by mail-dy1-f181.google.com with SMTP id 5a478bee46e88-2b71515d8adso766555eec.1 for ; Thu, 29 Jan 2026 00:46:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1769676374; x=1770281174; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=Tng3+pOB53pLZW+pGJL9iXigR2ZikgpGjqvJUqlRZU4=; b=in+aMamYOb8ZZb9QCzCcopK5GsZBmq6GFBPLlte5YQ31EvLkv8eiQq9c6PUz7d5SIo 8pjv3KQC15f1t7hddjF+1H8fxvgjNKf5ygL3fOrhMYv55/HjYDlubuq/7cnRJD8/mEr+ dxGtJWYzFbkaPfXp3COZ/8ROa2o28UdS09PaNwaLlZdBhb4PZ6tiBwv5mIeOGzWpi/Gg 3HmdMx8au24LamLsbUBxAw6t9wVqlGl5KzSayqRUaXR+a5vfA4XHSHsnfQ06/1dgzSC0 bZmDh6xR09wSMYyDMHamkARuJiHAjuM616QXwaKUaBpFPCMDaHz5cL2otMId5eVCvTN0 ILIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769676374; x=1770281174; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Tng3+pOB53pLZW+pGJL9iXigR2ZikgpGjqvJUqlRZU4=; b=SDLGPEmHq2hYJDAeNDkvhDQLZfEcET+03oxh2AgLf6XDRCwtvuwHovjvjfEA6R12sJ RMreJ5Noglj1YmgU4wdaWLZUCu7Psa8s+soe4s8e95Tko59nessCSVUCqO7q/HNJ63Ir ecCJvAtCH8XT25tFdhONQ5QrtO+BmkqCCE4eC0mnVlcy5Q2dukDUZNO7t2XP+9o80m2o LCetSAGO3wZrYLSaZUBF3XECdMkD4W+1h//wVM/6Sb+PE/JSMoytKT+md1CQTpISIdeE mbhLIrvb/1aX9+POjVPqw/g441Au2txvQMbx+XNHVl15Q/rPyz2u4FhuwjuVuxfLbIGH esXg== X-Forwarded-Encrypted: i=1; AJvYcCVbPhK99Ym6wREhk42EKKoVjQWfY971iXd5sQMY4e5mdvv24eT3a8wHXD1WIgQLkukE6wsk5AXYjI2yvcE=@vger.kernel.org X-Gm-Message-State: AOJu0YxBBLOch8cpq99NEN0I9pfP0cjKq+Vb2uCWLUI9ARUdoEwqFhLx Cu1vET22hWT2X8GrZ2auG6ievqkQHxlRZMNFudBZkAZapW/2MDdJb8Kw X-Gm-Gg: AZuq6aLss51cOjGGDfJ4G4N7j6eQOcqqZSnSfN4wRRWAZGSr5kMpnC+iFnuekNCALLw VQSmsQj1ydu+p65zrwyfGh9fNv4Ib7kJt4AzFWLMZPP4YtYH2w94c22n6b7aZ0TVNZH3XqGVYx8 yTOEYKLhRhl+P7anZ9JFOaPyJ0vVlnGEJtOjX5WDsDHDUk5Rj11HAREiSn4gK2pt4WgbOrWQGjW fAFX349sG2UzCSRg6HikLXkDlBCM/20AH1i2IuTz5K/m8VDT6i+bj51kODJEUZlaw6OENUDSHQ9 xqMZT+qYv7KmCR+PmhUVVja/AZk1azFwboQyPS/If8gewjcVTH6Ut281wW88K4PLjzBbEa1EV7u xUxv4yTyxWRvKoQTCGTNXbVLgEJn8797WIVnkJcL8rDwgTH7tbNRrnk/LUWfq9CwXJ2Cw8UTEg6 kR2LCUXhxHlaBHuOhD/fpbqwf40QLWjoN3l2GbSnf3yxSHTOzF3HnhcdKa8lTNSWbB/ewdi1b8 X-Received: by 2002:a05:693c:3017:b0:2b0:52cc:fe69 with SMTP id 5a478bee46e88-2b78d86845dmr4198171eec.5.1769676374355; Thu, 29 Jan 2026 00:46:14 -0800 (PST) Received: from zcache.home.zacbowling.com ([2001:5a8:60d:bc9:4a3c:9f7c:8037:90c1]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2b7a1abe92dsm5947583eec.17.2026.01.29.00.46.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 29 Jan 2026 00:46:13 -0800 (PST) Sender: Zac Bowling From: Zac To: nbd@nbd.name Cc: deren.wu@mediatek.com, kvalo@kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-wireless@vger.kernel.org, linux@frame.work, lorenzo@kernel.org, ryder.lee@mediatek.com, sean.wang@kernel.org, sean.wang@mediatek.com, zac@zacbowling.com, zbowling@gmail.com Subject: [PATCH 2/6] wifi: mt76: mt7925: add NULL pointer protection for MLO state transitions Date: Thu, 29 Jan 2026 00:46:11 -0800 Message-ID: <20260129084611.187744-1-zac@zacbowling.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260129081839.179709-1-zac@zacbowling.com> References: <20260129081839.179709-1-zac@zacbowling.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add NULL pointer checks for functions that return pointers to link-related structures throughout the mt7925 driver. During MLO state transitions, these functions can return NULL when link configuration is not synchronized. Functions protected: - mt792x_vif_to_bss_conf(): Returns link BSS configuration - mt792x_vif_to_link(): Returns driver link state - mt792x_sta_to_link(): Returns station link state Key changes: 1. mt7925_set_link_key(): - Check link_conf, mconf, mlink before use - During MLO roaming, allow key removal to succeed if link is already go= ne 2. mt7925_mac_link_sta_add(): - Check mlink and mconf before WCID allocation - Check link_conf before BSS info update - Add proper WCID cleanup on error paths (err_wcid label) - Check MCU return values and propagate errors 3. mt7925_mac_link_sta_assoc(): - Check mlink before use - Check link_conf and mconf before BSS info update 4. mt7925_mac_link_sta_remove(): - Check mlink before use - Check link_conf and mconf before cleanup operations Prevents crashes during: - BSSID roaming transitions - MLO setup and teardown - Hardware reset operations Fixes: c948b5da6bbe ("wifi: mt76: mt7925: add Mediatek Wi-Fi7 driver for mt= 7925 device") Signed-off-by: Zac Bowling --- .../net/wireless/mediatek/mt76/mt7925/main.c | 67 ++++++++++++++----- 1 file changed, 52 insertions(+), 15 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net= /wireless/mediatek/mt76/mt7925/main.c index fad3b1505f67..1400633712b7 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c @@ -612,6 +612,17 @@ static int mt7925_set_link_key(struct ieee80211_hw *hw= , enum set_key_cmd cmd, link_sta =3D sta ? mt792x_sta_to_link_sta(vif, sta, link_id) : NULL; mconf =3D mt792x_vif_to_link(mvif, link_id); mlink =3D mt792x_sta_to_link(msta, link_id); + + if (!link_conf || !mconf || !mlink) { + /* During MLO roaming, link state may be torn down before + * mac80211 requests key removal. If removing a key and + * the link is already gone, consider it successfully removed. + */ + if (cmd !=3D SET_KEY) + return 0; + return -EINVAL; + } + wcid =3D &mlink->wcid; wcid_keyidx =3D &wcid->hw_key_idx; =20 @@ -864,12 +875,17 @@ static int mt7925_mac_link_sta_add(struct mt76_dev *m= dev, =20 msta =3D (struct mt792x_sta *)link_sta->sta->drv_priv; mlink =3D mt792x_sta_to_link(msta, link_id); + if (!mlink) + return -EINVAL; + + mconf =3D mt792x_vif_to_link(mvif, link_id); + if (!mconf) + return -EINVAL; =20 idx =3D mt76_wcid_alloc(dev->mt76.wcid_mask, MT792x_WTBL_STA - 1); if (idx < 0) return -ENOSPC; =20 - mconf =3D mt792x_vif_to_link(mvif, link_id); mt76_wcid_init(&mlink->wcid, 0); mlink->wcid.sta =3D 1; mlink->wcid.idx =3D idx; @@ -888,21 +904,28 @@ static int mt7925_mac_link_sta_add(struct mt76_dev *m= dev, =20 ret =3D mt76_connac_pm_wake(&dev->mphy, &dev->pm); if (ret) - return ret; + goto err_wcid; =20 mt7925_mac_wtbl_update(dev, idx, MT_WTBL_UPDATE_ADM_COUNT_CLEAR); =20 link_conf =3D mt792x_vif_to_bss_conf(vif, link_id); + if (!link_conf) { + ret =3D -EINVAL; + goto err_wcid; + } =20 /* should update bss info before STA add */ if (vif->type =3D=3D NL80211_IFTYPE_STATION && !link_sta->sta->tdls) { if (ieee80211_vif_is_mld(vif)) - mt7925_mcu_add_bss_info(&dev->phy, mconf->mt76.ctx, - link_conf, link_sta, link_sta !=3D mlink->pri_link); + ret =3D mt7925_mcu_add_bss_info(&dev->phy, mconf->mt76.ctx, + link_conf, link_sta, + link_sta !=3D mlink->pri_link); else - mt7925_mcu_add_bss_info(&dev->phy, mconf->mt76.ctx, - link_conf, link_sta, false); + ret =3D mt7925_mcu_add_bss_info(&dev->phy, mconf->mt76.ctx, + link_conf, link_sta, false); + if (ret) + goto err_wcid; } =20 if (ieee80211_vif_is_mld(vif) && @@ -910,28 +933,35 @@ static int mt7925_mac_link_sta_add(struct mt76_dev *m= dev, ret =3D mt7925_mcu_sta_update(dev, link_sta, vif, true, MT76_STA_INFO_STATE_NONE); if (ret) - return ret; + goto err_wcid; } else if (ieee80211_vif_is_mld(vif) && link_sta !=3D mlink->pri_link) { ret =3D mt7925_mcu_sta_update(dev, mlink->pri_link, vif, true, MT76_STA_INFO_STATE_ASSOC); if (ret) - return ret; + goto err_wcid; =20 ret =3D mt7925_mcu_sta_update(dev, link_sta, vif, true, MT76_STA_INFO_STATE_ASSOC); if (ret) - return ret; + goto err_wcid; } else { ret =3D mt7925_mcu_sta_update(dev, link_sta, vif, true, MT76_STA_INFO_STATE_NONE); if (ret) - return ret; + goto err_wcid; } =20 mt76_connac_power_save_sched(&dev->mphy, &dev->pm); =20 return 0; + +err_wcid: + rcu_assign_pointer(dev->mt76.wcid[idx], NULL); + mt76_wcid_cleanup(&dev->mt76, wcid); + mt76_wcid_mask_clear(dev->mt76.wcid_mask, idx); + mt76_connac_power_save_sched(&dev->mphy, &dev->pm); + return ret; } =20 static int @@ -1039,6 +1069,8 @@ static void mt7925_mac_link_sta_assoc(struct mt76_dev= *mdev, =20 msta =3D (struct mt792x_sta *)link_sta->sta->drv_priv; mlink =3D mt792x_sta_to_link(msta, link_sta->link_id); + if (!mlink) + return; =20 mt792x_mutex_acquire(dev); =20 @@ -1048,12 +1080,13 @@ static void mt7925_mac_link_sta_assoc(struct mt76_d= ev *mdev, link_conf =3D mt792x_vif_to_bss_conf(vif, vif->bss_conf.link_id); } =20 - if (vif->type =3D=3D NL80211_IFTYPE_STATION && !link_sta->sta->tdls) { + if (link_conf && vif->type =3D=3D NL80211_IFTYPE_STATION && !link_sta->st= a->tdls) { struct mt792x_bss_conf *mconf; =20 mconf =3D mt792x_link_conf_to_mconf(link_conf); - mt7925_mcu_add_bss_info(&dev->phy, mconf->mt76.ctx, - link_conf, link_sta, true); + if (mconf) + mt7925_mcu_add_bss_info(&dev->phy, mconf->mt76.ctx, + link_conf, link_sta, true); } =20 ewma_avg_signal_init(&mlink->avg_ack_signal); @@ -1100,6 +1133,8 @@ static void mt7925_mac_link_sta_remove(struct mt76_de= v *mdev, =20 msta =3D (struct mt792x_sta *)link_sta->sta->drv_priv; mlink =3D mt792x_sta_to_link(msta, link_id); + if (!mlink) + return; =20 mt7925_roc_abort_sync(dev); =20 @@ -1113,10 +1148,12 @@ static void mt7925_mac_link_sta_remove(struct mt76_= dev *mdev, =20 link_conf =3D mt792x_vif_to_bss_conf(vif, link_id); =20 - if (vif->type =3D=3D NL80211_IFTYPE_STATION && !link_sta->sta->tdls) { + if (link_conf && vif->type =3D=3D NL80211_IFTYPE_STATION && !link_sta->st= a->tdls) { struct mt792x_bss_conf *mconf; =20 mconf =3D mt792x_link_conf_to_mconf(link_conf); + if (!mconf) + goto out; =20 if (ieee80211_vif_is_mld(vif)) mt792x_mac_link_bss_remove(dev, mconf, mlink); @@ -1124,7 +1161,7 @@ static void mt7925_mac_link_sta_remove(struct mt76_de= v *mdev, mt7925_mcu_add_bss_info(&dev->phy, mconf->mt76.ctx, link_conf, link_sta, false); } - +out: spin_lock_bh(&mdev->sta_poll_lock); if (!list_empty(&mlink->wcid.poll_list)) list_del_init(&mlink->wcid.poll_list); --=20 2.52.0