From nobody Sat Feb 7 17:55:59 2026 Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com [209.85.215.177]) (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 DF003222584 for ; Thu, 1 Jan 2026 06:25:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.177 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767248720; cv=none; b=kXCACTHE4AqgvUJAZma2a0WbvY+rASP1R3BrhZqroSWmvPNlSYI6pVQP8tWKAmuH7AKAYIwTRNrcq9OgpnMZefeEHW8iPXh33Z2ZGOR7PpkNQ/BpCsj5Z+UfdK3bZfGAVPUsARNlhdur4FFZtFZIchMU36lIPMNVj2gFipHASNw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767248720; c=relaxed/simple; bh=+w3JX7lEDErZykW5Xgcb1KQEhARVp1UUlw4uWeWGW3o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XGSXiTevCQRLgBR9En1iJRqZ51bNWYxyZXi8zyHrWHKRTnSYl8ZjXX+lMp01tL7Mrr+1ihPeQduS4xUrSOpDeoy0wh8NczYxuhL8Llyq8Lq/vrs2q8F8HQhCR4ytLcH7GHvHVHvPA/C+qN+8mGwvqhHcdflruDDHD5/iCvTn8XY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=FuVwJM3D; arc=none smtp.client-ip=209.85.215.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.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="FuVwJM3D" Received: by mail-pg1-f177.google.com with SMTP id 41be03b00d2f7-bc0d7255434so6683201a12.0 for ; Wed, 31 Dec 2025 22:25:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767248718; x=1767853518; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=LMNrli8fWuq22Lopa9PXMOKtBCB18Eukz20h2BFPXfY=; b=FuVwJM3D4AIU4QEFrYijtpIUTuy7xfF7OgYppg2RZOp8JZItkk4PuTJZSgsQc0PhM6 G9b3v+bjzEI4Lc6Az+Q6KibbElJ0rRKYtY8GTdDMDkFv66zkCFxzYuZ2GJM8nlwC7qb1 gD45/SQwa9ABpDl+90wbtfhk/eqeZ3pbSEg/gJCtBtTJbqx1I5J4hZ17i6pORv1x9AqC yBsa5omJlAIg1JYm8UyF6fL7PyW8FLv+s85zCIEcI/XdMEybUQBNFL1cpSZMraOZygfx +hqEeDeY1Wul46feQqjQog4d84fj7FU+yFhEDcMDw15NVSWguaAuINU3/JWeL3C/Pr+r phew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767248718; x=1767853518; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=LMNrli8fWuq22Lopa9PXMOKtBCB18Eukz20h2BFPXfY=; b=SfhzKkPElf9dPWfPelWQ7XQTstzU7zAk3ntjXQ+2W+TLAFBLdgPmp3dxeUzxtx9Ztf hZtBR2ChlDi8MLoZV5zmEhgW5fLNZf9XSuxhK7Go5zX7sn+4dUp77bWlGdvheDp2Ov2D /OIOhckjLeXTgeuams3QRKqQTf1gJhldfzRb7PNmHcNj0/ktl+txt74w3aI430BT8GOp XXjDcqNyRSQg/sBY/F1tgmNk5qoQGCsJ6FkS8zkoLOoIJg3CdiRddu+n3Yps8alVaVog N0EfBf7PsW4tiwBo4INWPNSp2m6Wmpzp4Rp29x5zmxOm/Mi5T0gpLbD2WgG8tY/grbpF grtA== X-Forwarded-Encrypted: i=1; AJvYcCUkDCzDJ6LrT/fwfAMVf/EykvftdxhZcRGLK87Q3t4aGl1opmWhhemeg6vluk+7c26FYyA5NZeSsu25Lmo=@vger.kernel.org X-Gm-Message-State: AOJu0YyqeFmRa5vgS5WdCoQ6rgjH7fdxj3SZOLLZT/sQACZQJrXB+/kt 0UdlIs8jj5JMuCTAk7CKfmohufn3010RAdoLNOb+33+p2bSBaDgE/JQ4 X-Gm-Gg: AY/fxX4oOWyb3Sj4/DYRpTHKawSjPHGCuRZExlb7+YD6db0ZtkgbchB1L+1gLhUAW15 yd3S+MEaR8lNULbbIDKLg5sNxu3Zn05GVFYwKoxfyPyOlPxElzaP/ijp/6xTHoY/912yyRYtRur O6+3qKacmQJjNRlPGu6KxorqNzpCdNxvQoOd1SqwUk7WC6ZhOUpX+ZvxKWYJmHYYYQnVKM9IuVN n/wwQSREsRrCi0wCkhz2EAmlvZTBHpeFoqR5E2X6pKKFSWZxiHNAAhg6rscD3NOqBPnv/3aFpMn Qts+GB+9F1QdOZJaVBGhpiBSnIXNtxxrqEx7fYtqPyCECscm85TOAlzAZKxdyEajnLL5I0FPX5S XIJYUFIxOVQNP5jGLudV3cpaA8ws7gU7i11BWJiyKFjkvxuWdOGib9AeZrTTZ8NZK44dh4lKYEy 1G9IXuSSqUE4CQt8R6XF3FF0oGLghfTU3zin4+NzonelyatzXvn13G+YTYF0OTNQ== X-Google-Smtp-Source: AGHT+IF8c3kpymCYxXLtXHPXPOh7mPJtKHA7XR9XpNIl8rN7FB8iVPcgOKK7KP9TRQAMuRn8Gghr5A== X-Received: by 2002:a05:7022:238f:b0:11f:3483:bbb2 with SMTP id a92af1059eb24-121722aae15mr34466776c88.12.1767248718059; Wed, 31 Dec 2025 22:25:18 -0800 (PST) Received: from zubuntu.home.zacbowling.com ([2001:5a8:60d:bc9:9ebf:dff:fe00:f8f2]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-121725548b5sm147035158c88.17.2025.12.31.22.25.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 31 Dec 2025 22:25:17 -0800 (PST) From: Zac Bowling To: linux-wireless@vger.kernel.org Cc: linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org, kvalo@kernel.org, lorenzo@kernel.org, nbd@nbd.name, sean.wang@mediatek.com, deren.wu@mediatek.com, ryder.lee@mediatek.com Subject: [PATCH] wifi: mt76: mt7925: add NULL checks in MLO link and chanctx functions Date: Wed, 31 Dec 2025 22:25:14 -0800 Message-ID: <20260101062514.186040-3-zbowling@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260101062514.186040-1-zbowling@gmail.com> References: <20260101062514.186040-1-zbowling@gmail.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. Reported-by: Zac Bowling 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 058394b2e067..852cf8ff842f 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; + + link_conf =3D mt792x_vif_to_bss_conf(vif, mvif->deflink_id); + if (!link_conf) + return; =20 - u16 sel_links =3D mt76_select_links(vif, 2); - u8 secondary_link_id =3D __ffs(~BIT(mvif->deflink_id) & sel_links); + 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.51.0