From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5CF5E284898; Sun, 1 Mar 2026 01:26:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772328373; cv=none; b=Y9+kGzDJm+OjEKIF4v36qubohwNZMqOH8g4CzU4cv34DXBkif4A4GZDI3S76oYKYoFKwBERWQ1anDMuTvvHMFjV6LFeWljCYzU0iRECxp7A1Oc/6+2z9K14T6Wib629QuRJV+8ecQNAM9SeyexkGTPVCxuQFGgcM/T/RSbNybf8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772328373; c=relaxed/simple; bh=sBm6WNNMF/Wp1cMcvjbjxSLqqZjKsSZOnkYuLWT/z1I=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=FMT1ViPhBGbMVX9mCG+EwyckX4IqeUcayiv/hGdgssBIBdabKYSKFaiUndHoQDgIlNoYs5FSz6cRmeuDmxUwqlmFIjoVA1+BnlCsCYD/xbsj7p7uGKnnHYRq5l81pVIdT+KCXEE99FIzs+P0dOU1gwNqujshlC90nKR1OQFTTS0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=UhT8+8Bd; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="UhT8+8Bd" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 972E4C19421; Sun, 1 Mar 2026 01:26:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772328373; bh=sBm6WNNMF/Wp1cMcvjbjxSLqqZjKsSZOnkYuLWT/z1I=; h=From:To:Cc:Subject:Date:From; b=UhT8+8BdZWf4NeyrkKP2HFI3b9OUPqGqHg8tzQ63FRSSVUEbraXCePm89vnG5jsNS SKzk7ktv3Rvco1E0G284VehqYatowZgXLseR8Rtblr/TOX1MWEOcy8x9FPXG0hrbbQ EZ3i7KuHIPzgkIHCIBC+Q2q1aAyyq2OeHl0luYt1b3k8reu6+kELvt0dygF9gU4xeW PtcERqeo/0RGPDXW5nED22cxJqlt67kSJm/yMOtCQAloSwZJvZAf4hFx7Yz/SwF/P4 P4NW2AA/EYZPV/kefNYqXvqmnnBxZk+6vhL8oNMp5byBDPAZzZqWXA4ABBUvHkvBSo WBsgXlU5iXMcQ== From: Sasha Levin To: stable@vger.kernel.org, haokexin@gmail.com Cc: Alexander Sverdlin , Jakub Kicinski , linux-omap@vger.kernel.org, netdev@vger.kernel.org Subject: FAILED: Patch "net: cpsw_new: Fix potential unregister of netdev that has not been registered yet" failed to apply to 6.12-stable tree Date: Sat, 28 Feb 2026 20:26:11 -0500 Message-ID: <20260301012611.1683532-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.12-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 . Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 9d724b34fbe13b71865ad0906a4be97571f19cf5 Mon Sep 17 00:00:00 2001 From: Kevin Hao Date: Thu, 5 Feb 2026 10:47:03 +0800 Subject: [PATCH] net: cpsw_new: Fix potential unregister of netdev that has not been registered yet If an error occurs during register_netdev() for the first MAC in cpsw_register_ports(), even though cpsw->slaves[0].ndev is set to NULL, cpsw->slaves[1].ndev would remain unchanged. This could later cause cpsw_unregister_ports() to attempt unregistering the second MAC. To address this, add a check for ndev->reg_state before calling unregister_netdev(). With this change, setting cpsw->slaves[i].ndev to NULL becomes unnecessary and can be removed accordingly. Fixes: ed3525eda4c4 ("net: ethernet: ti: introduce cpsw switchdev based driver part 1 - dual-emac") Signed-off-by: Kevin Hao Cc: stable@vger.kernel.org Reviewed-by: Alexander Sverdlin Link: https://patch.msgid.link/20260205-cpsw-error-path-v1-2-6e58bae6b299@gmail.com Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/ti/cpsw_new.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw_new.c b/drivers/net/ethernet/ti/cpsw_new.c index b9fc31eb06134..7f42f58a4b031 100644 --- a/drivers/net/ethernet/ti/cpsw_new.c +++ b/drivers/net/ethernet/ti/cpsw_new.c @@ -1472,7 +1472,7 @@ static void cpsw_unregister_ports(struct cpsw_common *cpsw) for (i = 0; i < cpsw->data.slaves; i++) { ndev = cpsw->slaves[i].ndev; - if (!ndev) + if (!ndev || ndev->reg_state != NETREG_REGISTERED) continue; priv = netdev_priv(ndev); @@ -1494,7 +1494,6 @@ static int cpsw_register_ports(struct cpsw_common *cpsw) if (ret) { dev_err(cpsw->dev, "cpsw: err registering net device%d\n", i); - cpsw->slaves[i].ndev = NULL; break; } } -- 2.51.0