From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794048323; b=Ax7JYL4n5iGR45EA5twjrpcL7M0c5WfYCxM5qs+ShkVAPFZDZB3Bbu+jGIxEJph0xDVa sysqKM5lqSqQ8sIiIAk0PHYr7CyDt0yLtlzO1SCxDW8xRIbwAujxgAxTjBgsSLeMdKAfP xh6XBYhT2o7hXTXTGI/Yxcj91TqHxr9p3CxnGf0p0oipB3roff1AKKIDzuE3zd64sWTqq +Sl4nE+R5OauoqNWzeup7YA3S+eVDUAP85mg201lLFsXTH2gtkf8dkMm9XrwdgCidbSZT /FMO93bZcPqE1XFAK6ylL1huu3R483puPsbGob7ykGwnY5Ays9mOpesonZQN11++yZA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794048323; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=yxD2ZuO5Lr/s/JPtmTgpC5x4eroudIMNS30Zm4CnWtM=; b=Jqbz2J0ZJNepNBe0d3cAccqYwAiIT/yGN9ORVKBU024OgHrwgexgGtU3CEKqaSsztCWU 08W6RYvMowClwU7gZn2rbvLz7RUorlW810U+F4bR06utmPqJVo9od9/Ua/whxUojyJQiE Vb/2QDmvOCqWy0Al96lTfwMMgI+bdfhuL0bDvWivQcujzviAR8RQC4J5JGrTw1yArGm4c c0UoG52tqUs32TYMF5U8loLZzGXLS81EYnbQVxc98QG8hVRjkjliQgyTBhlquhge677aB vjclibOnfuN2BER9o8W7MoK73Pf1Ko4zYAORlsW5Pjf0Gy4ak2DxlPQAGWRWZwzJj0A== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=SFOOdnXp; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 55311606A326 for ; Sat, 7 Nov 2026 10:45:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=SFOOdnXp Received: by smtp.kernel.org (Postfix) with ESMTPSA id B2FA51F0089F; Sat, 7 Nov 2026 10:45:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794048323; bh=yxD2ZuO5Lr/s/JPtmTgpC5x4eroudIMNS30Zm4CnWtM=; h=From:To:Cc:Subject:Date; b=SFOOdnXp1phBV8pNZi/U7xfNCi568Criw+BTPhipV2ehj+K9A2esFvSN2xQGI2x7x xuSTAVuaBAcEuY04zDqK4kSV0CULhXOD/zCLk1G+LTnrjglRzCM3qOBA4fTgNKQepg N/OifP+KPgJJE84wXsQEzLli1fVP2DETCW+kqTKnSJZUgwrQKy6vqW5XNjRmJsp8/C JSKjCckRCkqzuOwYpZ+QiZ9LWycAmv8ecZIiYPHD7BJt+4tNv9fmGqlVpeJ3zDkWKh oihQ1Vu8Cu00GbLO4LEJ5FxTSfQJDGyXWFXd2T6fcO5C2UH/QP2Cd3ioq2+09oPT5g A2d8+Yv9DDSoQ== From: Sasha Levin To: mhun512@gmail.com, ae878000@gmail.com, nbd@nbd.name Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] wifi: mt76: mt7615: restore DBDC state after ext PHY failure" failed to apply to 6.1-stable tree Date: Sat, 7 Nov 2026 05:45:21 -0500 Message-ID: <20261107054521-failed-6.1-7907d5270dc5@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 7907d5270dc5c13b6a95754c08a77d5b06bbc786 # git commit -s git send-email --to '' --in-reply-to '20261107054521-failed-6.1-7907d5270dc5@kernel.org' --subject-prefix 'PATCH 6.1.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 7907d5270dc5c13b6a95754c08a77d5b06bbc786 Mon Sep 17 00:00:00 2001 From: Myeonghun Pak Date: Thu, 10 Sep 2026 17:54:41 -0400 Subject: [PATCH] wifi: mt76: mt7615: restore DBDC state after ext PHY failure mt7615_register_ext_phy() limits the primary PHY to DBDC capabilities before allocating and registering the secondary PHY. If allocation, EEPROM override, or PHY registration fails, it returns without restoring the primary PHY capabilities. The EEPROM override failure also leaks the newly allocated ieee80211_hw. Route all failures through common labels that free the secondary hardware when it was allocated and restore the primary PHY capabilities. This issue was identified during our ongoing static-analysis research while reviewing kernel code. Fixes: 0f2173f093b3 ("mt76: mt7615: add support for registering a second wiphy via debugfs") Cc: stable@vger.kernel.org Co-developed-by: Ijae Kim Signed-off-by: Ijae Kim Signed-off-by: Myeonghun Pak Link: https://patch.msgid.link/20260910215441.76683-1-mhun512@gmail.com Signed-off-by: Felix Fietkau --- .../net/wireless/mediatek/mt76/mt7615/init.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/init.c b/drivers/net/wireless/mediatek/mt76/mt7615/init.c index e437e088b2e91..665b0f1e939f1 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/init.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/init.c @@ -541,8 +541,10 @@ int mt7615_register_ext_phy(struct mt7615_dev *dev) mt7615_cap_dbdc_enable(dev); mphy = mt76_alloc_phy(&dev->mt76, sizeof(*phy), &mt7615_ops, MT_BAND1); - if (!mphy) - return -ENOMEM; + if (!mphy) { + ret = -ENOMEM; + goto error; + } phy = mphy->priv; phy->dev = dev; @@ -572,7 +574,7 @@ int mt7615_register_ext_phy(struct mt7615_dev *dev) ret = mt76_eeprom_override(mphy); if (ret) - return ret; + goto error_free_hw; /* second phy can only handle 5 GHz */ mphy->cap.has_5ghz = true; @@ -590,7 +592,14 @@ int mt7615_register_ext_phy(struct mt7615_dev *dev) ret = mt76_register_phy(mphy, true, mt76_rates, ARRAY_SIZE(mt76_rates)); if (ret) - ieee80211_free_hw(mphy->hw); + goto error_free_hw; + + return 0; + +error_free_hw: + ieee80211_free_hw(mphy->hw); +error: + mt7615_cap_dbdc_disable(dev); return ret; } -- 2.53.0