From nobody Mon Feb 9 15:09:54 2026 Received: from mail-dy1-f170.google.com (mail-dy1-f170.google.com [74.125.82.170]) (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 5DB8F302CDE for ; Fri, 16 Jan 2026 01:05:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768525550; cv=none; b=nA3L9jBtYgJK36ynOcbZmCdB8kEyr+Y9zTBBJEwfRlcHh+O04AMMxptZc5K9etmHkNepqS3MTHWFLFNu+Wvvne9QXN1UupziM6wHOgpp9L7pX+eUOPlU35oMOIFkmpdm/X9RfR8+sIEC+KQxPcmXdb9hpNHzCxHw6tgyjhzLHRY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768525550; c=relaxed/simple; bh=UtDRJAA+MPtf7ebptEaBueINPsW854AUm8zzzFfN3Ak=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GayK6OtFp0bEZikwXUFIyn+g5jCevW1zNPjcMcblP3e9TCBxzphQSjsvIdwVCSmRbkWtpitInuXYIjj2tAHzJ/4dzKFpH+nJDwZkU7QRshzvtXrbyDZJfhk+I69mSs1thnMI3RuKaIF/HlRnoUSVZ7ns5HKM2QJF5SSX1EvTUbQ= 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=h2m/bVYB; arc=none smtp.client-ip=74.125.82.170 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="h2m/bVYB" Received: by mail-dy1-f170.google.com with SMTP id 5a478bee46e88-2b6b0500e06so914170eec.1 for ; Thu, 15 Jan 2026 17:05:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1768525536; x=1769130336; 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=rZlc8vYTcRnUgM5gL9ljbqiK/D1gsQfXcDj7/vtO1vs=; b=h2m/bVYBgaEH3ISUEhtu5hSWY4GAKVBJq6xWrhW+zMQr66/gz2iNIk2dO8uEiM6isC sSI484dCGNE5iONZfuZkkearpkaLEDIq1SrvRvBim4ahEwQUGpDRPaBPNiFuLRtQyra5 Zn7wEyFWmUGrF8tR3DvkZ4ACBAJGgjq6HkUighedf1kS8IarBSRodkLoAS6nykeq6Btv RoRUa1hGZAe6eMvWue3d+0TBtlDo+NnLd8ZTPfPw+XEXNnN1AbfKv7rYZRmqmYFJjFy1 v1y/1XZBQN9gICBNKwdEO1U7QhlYnLJhQap66X0XTlmgE84gsFi81Cat3j+H9hbzWsw3 1oFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768525536; x=1769130336; 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=rZlc8vYTcRnUgM5gL9ljbqiK/D1gsQfXcDj7/vtO1vs=; b=AM0tidA98TIF10H4Fu9jO9F329NUDzMzbnx4y5uV8d+awpsAqmDr/8oXozDIbhnzfz 66nXqN1gplxdq8dpbAp/nKPhts8BiG1/9AAqNCeKPosH3vRXNAg33Xc6kYU5xmWUujQc PkNbOi3lvuplSI/paeHxvrYb6Poi69ASq9pobqxSy9QWrloP26pKIgFlIpO3TuEQZ9Kh wgI7w+GHETCk4JeA7Ioc/pHAQPbsjZoMQwcyp949z5a3VLbd+Toy0GFpfFJbSy9A11kv zh0D1X6yaUTsgzOACSyO8QJakOJlHBVJbZgxGoCAoKqRUJXXgGKCzezBT9jH4K/VZN5h 4cHQ== X-Forwarded-Encrypted: i=1; AJvYcCUZvmqvxCSL+XsrPx1RGTpDurWblp+iCB24nIj8sKwdmEMZ3G1RI3di8vRKQAECBjWYY6ny9gQTtW/WJ0k=@vger.kernel.org X-Gm-Message-State: AOJu0YzXG+clNGwpxA+cFABMdF+3+9rM+Ar99bmPs2ICzK/Sm9PlTuIg 2IqCAVWAW+0KGord6di8A6tfrGfa90GibM486rgBHp1LKNbFTJIrAkpC X-Gm-Gg: AY/fxX74y2zbS8X3lfCZcn2SJl5cnu0FOjwtnsibCrhTt4JC5ymZeb+XZlB7GC5o25z UOmIhvUXJXEfQg9qgCQqrPEZcnRx1Yk8DVjObP9HFVM4Bq6MDoJPtuODPzbA/UpvY6cfXGSnKB3 pswKTPIyDYBW8K+Xt6CkhS8wxBDRL85GXK/Y5+fHlJnuQkg7uBPL7eNJrVdVjfggTlTRVDQ94yp hwZj52KWQZMx2lQ+WgeSgxsBShhObYTcdBiB5lIuWyzXWoVHlrBfOgRonFtWb68G84rt0ut/neL ztiLEZksVsYCsP7r5L1sFBW0/Kd9qHz7SoYfwjBNQ8sDrFRRd9ca4z6fnFhTDUKPLnAsuMmyrUP 6AlAnelq/qi2kJOhEa3i//DgOM+NkHKcgbHB74Mvcz0YuByN/0qvW+Ogao1uEwWe0OhMHosOtNZ pG9SDoNgL20MS97lqGz5kTJi/EljzaoL1SoAKq7Ek6ru2gzs6pXi9y3wDTKtfXYQ== X-Received: by 2002:a05:7300:b505:b0:2b0:5412:3ef with SMTP id 5a478bee46e88-2b6b412b810mr1269769eec.42.1768525536379; Thu, 15 Jan 2026 17:05:36 -0800 (PST) Received: from zcache.home.zacbowling.com ([2001:5a8:60d:bc9:f1d2:502c:a6ff:5556]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2b6b367cbc9sm1019884eec.32.2026.01.15.17.05.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jan 2026 17:05:35 -0800 (PST) Sender: Zac Bowling From: Zac To: sean.wang@kernel.org Cc: deren.wu@mediatek.com, kvalo@kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-wireless@vger.kernel.org, lorenzo@kernel.org, nbd@nbd.name, linux@frame.work, ryder.lee@mediatek.com, sean.wang@mediatek.com, Zac Bowling , Zac Bowling Subject: [PATCH v4 09/21] wifi: mt76: mt7925: add NULL checks in MLO link and chanctx functions Date: Thu, 15 Jan 2026 17:05:07 -0800 Message-ID: <20260116010519.37001-10-zac@zacbowling.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260116010519.37001-1-zac@zacbowling.com> References: <20260116010519.37001-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" From: Zac Bowling Add NULL pointer checks for mconf and link_conf in several functions that were missing validation after calling mt792x_vif_to_link() and mt792x_vif_to_bss_conf(). Functions fixed: - mt7925_mac_set_links(): Check both primary and secondary link_conf before dereferencing chanreq.oper for band selection - mt7925_link_info_changed(): Check mconf before using it to get link_conf, prevents NULL dereference chain - mt7925_assign_vif_chanctx(): Check mconf before use, return -EINVAL if NULL; check pri_link_conf before passing to MCU function - mt7925_unassign_vif_chanctx(): Check mconf before dereferencing, return early if NULL during MLO cleanup These functions handle MLO (Multi-Link Operation) scenarios where link configurations may not be fully set up when called, particularly during rapid link state transitions or error recovery paths. Prevents panics during WiFi 7 MLO link setup and teardown sequences. Reported-by: Zac Bowling Fixes: c948b5da6bbe ("wifi: mt76: mt7925: add Mediatek Wi-Fi7 driver for mt= 7925 chips") Signed-off-by: Zac Bowling --- .../net/wireless/mediatek/mt76/mt7925/main.c | 39 +++++++++++++++---- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net= /wireless/mediatek/mt76/mt7925/main.c index 058394b2e0..852cf8ff84 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c @@ -1006,18 +1006,29 @@ mt7925_mac_set_links(struct mt76_dev *mdev, struct = ieee80211_vif *vif) { struct mt792x_dev *dev =3D container_of(mdev, struct mt792x_dev, mt76); struct mt792x_vif *mvif =3D (struct mt792x_vif *)vif->drv_priv; - struct ieee80211_bss_conf *link_conf =3D - mt792x_vif_to_bss_conf(vif, mvif->deflink_id); - struct cfg80211_chan_def *chandef =3D &link_conf->chanreq.oper; - enum nl80211_band band =3D chandef->chan->band, secondary_band; + struct ieee80211_bss_conf *link_conf; + struct cfg80211_chan_def *chandef; + enum nl80211_band band, secondary_band; + u16 sel_links; + u8 secondary_link_id; =20 - u16 sel_links =3D mt76_select_links(vif, 2); - u8 secondary_link_id =3D __ffs(~BIT(mvif->deflink_id) & sel_links); + link_conf =3D mt792x_vif_to_bss_conf(vif, mvif->deflink_id); + if (!link_conf) + return; + + chandef =3D &link_conf->chanreq.oper; + band =3D chandef->chan->band; + + sel_links =3D mt76_select_links(vif, 2); + secondary_link_id =3D __ffs(~BIT(mvif->deflink_id) & sel_links); =20 if (!ieee80211_vif_is_mld(vif) || hweight16(sel_links) < 2) return; =20 link_conf =3D mt792x_vif_to_bss_conf(vif, secondary_link_id); + if (!link_conf) + return; + secondary_band =3D link_conf->chanreq.oper.chan->band; =20 if (band =3D=3D NL80211_BAND_2GHZ || @@ -1927,7 +1938,12 @@ static void mt7925_link_info_changed(struct ieee8021= 1_hw *hw, struct ieee80211_bss_conf *link_conf; =20 mconf =3D mt792x_vif_to_link(mvif, info->link_id); + if (!mconf) + return; + link_conf =3D mt792x_vif_to_bss_conf(vif, mconf->link_id); + if (!link_conf) + return; =20 mt792x_mutex_acquire(dev); =20 @@ -2136,9 +2152,14 @@ static int mt7925_assign_vif_chanctx(struct ieee8021= 1_hw *hw, =20 if (ieee80211_vif_is_mld(vif)) { mconf =3D mt792x_vif_to_link(mvif, link_conf->link_id); + if (!mconf) { + mutex_unlock(&dev->mt76.mutex); + return -EINVAL; + } + pri_link_conf =3D mt792x_vif_to_bss_conf(vif, mvif->deflink_id); =20 - if (vif->type =3D=3D NL80211_IFTYPE_STATION && + if (pri_link_conf && vif->type =3D=3D NL80211_IFTYPE_STATION && mconf =3D=3D &mvif->bss_conf) mt7925_mcu_add_bss_info(&dev->phy, NULL, pri_link_conf, NULL, true); @@ -2167,6 +2188,10 @@ static void mt7925_unassign_vif_chanctx(struct ieee8= 0211_hw *hw, =20 if (ieee80211_vif_is_mld(vif)) { mconf =3D mt792x_vif_to_link(mvif, link_conf->link_id); + if (!mconf) { + mutex_unlock(&dev->mt76.mutex); + return; + } =20 if (vif->type =3D=3D NL80211_IFTYPE_STATION && mconf =3D=3D &mvif->bss_conf) --=20 2.52.0