From nobody Fri Jan 9 00:44:14 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (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 3506B1EA7CB for ; Mon, 5 Jan 2026 00:27:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767572823; cv=none; b=K0l6TeNSN5gTUSob484pHqbjxtruM4XaA5V6JZF3OyZDr7D7MzZJrK5aPM695Hrwwds9Wd+mBKZWdhK0U4v/PFT6f7tOi2gPgn6+Z7N7uhJ0PXjx91Dv+/NfkKfZ0rvoS2PFkzaDfjZxiUgxrAwYaI6vCqhws+htytE+CWDETWA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767572823; c=relaxed/simple; bh=okEPcwgetydhi6CjB9gPnDTD93VrrmmPij1wmDYyiRo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=t3xj9bcVWmWcTZldcoIRAgboMebDXtP/6s7QDbNs2XEKo8FUuccd5eEtvAU9ntsLcsyG0wzZOwipsgveArbSBeO/6eZFloB4UtWMsPMdfuaQ+8fba/WD9zXKLKUQK9nVODe/1dtZ9v/IMjAi8V2YRhU7P8goEH3pnZwDA83Q2xc= 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=f6/A8X0Q; arc=none smtp.client-ip=209.85.214.174 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="f6/A8X0Q" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2a0d6f647e2so220251735ad.1 for ; Sun, 04 Jan 2026 16:27:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767572820; x=1768177620; 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=qAUwSXTcbTdlZ05tKagbWIWR8etmGqco3VAQevRh9HA=; b=f6/A8X0QcwIeVVDgYgmodgBtSbe6nYPECYXbwZg2ulS5mLXCL1K+XwjBGndJLhDjR2 lzuQdZ0a+LT2hjcZ2WRaaDkCIZgu/vSLTS8tkf4N9x3hVqgrMX7/hoij6kEUvqN6YpG5 +u0D1cAcpFQzmMPHNNTuCO71F+jbf/ttzKTOXLzYgf6UrKWdU8naU0gJewIJ8tngKz0H 8q/iGIq50qxxVo1wYbybMpIOUXt1jnkdkwzEUYfRhMtNfoxwtDZ5xvaGd+Ima7iJ6yxR iVqOoLN/b7EaUa6/6fQGwJGZDbJwBgWL+xLsLKTHbhDWUTlOwglpzGwhHUWqzTdpgB0R mcZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767572820; x=1768177620; 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=qAUwSXTcbTdlZ05tKagbWIWR8etmGqco3VAQevRh9HA=; b=XYT0+242DGzRRSqOGR7/VleFboINHPRSE3qdColm7oSyWG8XJVfel69Im0HcunnTAV Qd67pvoOfx8j1a9On+y1Tf2i4fa+1pjGnshqP5xsri4wgEPsEgoHMUeZKSQMrMjuT8R7 SLuf/NZvM5bHojjdc3NprxA0pPqJEr/COapeuB6Je2yq7LCc8tkHZbkeH+04F+9Tpbqx puhSh50Ogdv7vMdZe0rnHcBL9S8qv7pC2yTcc4n5pc1bz2YayOhPjjl0hTJmSL7cL6+l 4m26xN7Wt6nD3ScMY0h3dVngFsLif5z2IPwcoYfbHGuhgBIfBFRJ+LPY34o6mEhvHQWr Dtpw== X-Forwarded-Encrypted: i=1; AJvYcCWcvu5JW5fDxhezAVHBaFpCwBLn8ONmlnhd7EJ4DEjTgD4WxX3SpMQlcgnKnUKtssSA+2J8z76M1YYwe6A=@vger.kernel.org X-Gm-Message-State: AOJu0YxXQglgZug658rIXn5eM089KU1cQY+S9tVD0Sqecv9ALADNdBmT Yq/aU12nTWdE1vwzPgXQOS1lse9yPdd82ZhsT7GGHJ0wAIGkveNDKMwx X-Gm-Gg: AY/fxX4v07srYFaoDWASGbL8CuXdBiDoAR7qkbZAPZY4uj7wLbqRRevCmfjpER7sXfJ 9Fb00nXq/qJph0gIPpw8UBd5UOLvyASFYLFne5IMESJhnqajN6UpKKUKYfBTf+yWLiv2G6CgT+o tJoroVJET0YYhe4OLJtqWJrd8n9K14OhsVMiIH2T4ktV/e1RHt1WZxaHOxdugPVN1VdnUnupQZo tjsUbvK/5FK71ddXdK6EjLstGBAtYb1QWZYLm2HZ3RAgWttJbjb3tIJBsZbJDEhzgdRAZfRN+iq srqyPNV0RIV5UElQe/9kmMPHhAl4SFU2lnav381z2ocSjk6+c+YgBb9rjI9RgEq10N5Blf1aqJA /XfsalscNlW8FZbf80Do6NOl5pJrJl53uh4A7vQ2NBnwVK5oE36oyKHSFQMibLn4+sQGZmF2hVt 2UvobtIu2PHMMRDxFUiFx7T54HW//vZ/nKkotp/iExszj5GLWlE49o0FMAbFz+ngQ= X-Google-Smtp-Source: AGHT+IEg+0O/U6jFKiIyTWm00cf6Hb3sWob6ISMuhNcfPkGZ9TORICaTgtXbn0sRqNiFULYdjJHR4w== X-Received: by 2002:a05:7022:6b92:b0:11a:4525:5361 with SMTP id a92af1059eb24-121722a5f18mr45266378c88.6.1767572820373; Sun, 04 Jan 2026 16:27:00 -0800 (PST) Received: from zubuntu.bengal-mercat.ts.net ([2001:5a8:60d:bc9:9ebf:dff:fe00:f8f2]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-121724de268sm133378109c88.8.2026.01.04.16.26.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Jan 2026 16:26:59 -0800 (PST) From: Zac Bowling To: zbowling@gmail.com 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, ryder.lee@mediatek.com, sean.wang@mediatek.com Subject: [PATCH 09/17] wifi: mt76: mt7925: add NULL checks in MLO link and chanctx functions Date: Sun, 4 Jan 2026 16:26:30 -0800 Message-ID: <20260105002638.668723-10-zbowling@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260105002638.668723-1-zbowling@gmail.com> References: <20260102200524.290779-1-zbowling@gmail.com> <20260105002638.668723-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" 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 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