From nobody Mon Jun 8 06:36:13 2026 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.3]) (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 BB7912571A9; Mon, 1 Jun 2026 07:38:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.3 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780299505; cv=none; b=HmYyDUQXQshZ+PRl/RAofeRllQNJmG9VIILQu7/oDKWQ0lA19WadPyWNsp5RPISMt5wUL6pw82MmBv8Vp2uZ7arR6T6aC3tLp9PIUeEXnkb4tBZXV++NJkAwhWANQo4n7i77ilpSipjmUx21KTOEntU3TQrxIvv07w0heb17+30= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780299505; c=relaxed/simple; bh=2YE2wZOllCBIEKpAf/uC5durFePtRL+ejaci32+1IWw=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=CP1Zfzqtcdet19xEMsivFUmRkXsD+OO7ZUOfctXZtRyFDmCJGGd/g6ZOJVnPnowgPXfdlWIQHqMzkGNnSW9qlxrCmC7Es5mdoLQkYk1NWxjO7oGFs65POLSeBTGdydlvagtxH4VHWHHbCIpZGvd+XZ4a/P9uZPQthpi8BFJf1ps= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=Hb8Rjc1x; arc=none smtp.client-ip=220.197.31.3 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="Hb8Rjc1x" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-ID:MIME-Version; bh=Bn bP9kJmQts+3i4uAyu6Sx/r3PJOOQ+PzeiLONN5+XI=; b=Hb8Rjc1xLR8mqRAPdg lnepEcO3h7Z+gVOVvgot3k27DCkStVBGXrotI4jwNUUyuSfJGa6+Z/zEIumdp70A 7Y9DNn0M3BMbzJxlMj/xY3+yxoMVv3BEal3+djlReQ3/fOo9cWrgakaVZdqCXxap s7qa6r8aN+7fgg4KezEw//Dxc= Received: from China-163-team (unknown []) by gzga-smtp-mtada-g0-2 (Coremail) with SMTP id _____wAXH8zWNh1q+tkPAw--.54045S2; Mon, 01 Jun 2026 15:38:00 +0800 (CST) From: Wenshan Lan To: gregkh@linuxfoundation.org, sashal@kernel.org, stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Kevin Hao , Alexander Sverdlin , Jakub Kicinski , Wenshan Lan Subject: [PATCH 6.1.y] net: cpsw_new: Fix potential unregister of netdev that has not been registered yet Date: Mon, 1 Jun 2026 15:37:56 +0800 Message-ID: <20260601073756.73404-1-jetlan9@163.com> X-Mailer: git-send-email 2.43.0 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 X-CM-TRANSID: _____wAXH8zWNh1q+tkPAw--.54045S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Ar15Gr4DWFWUtF1ruFWDCFg_yoW8Cw4xpr 4rKa4S9a1vqr4kXwsrJa4UJFW5W3W2q3s3ur9rCa4SvF4qy345tF1DXFyagFy5ArWxGF4Y yw1avw1vva4DAaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pij-e5UUUUU= X-CM-SenderInfo: xmhwztjqz6il2tof0z/xtbC7BilbmodNtgZoQAA3e Content-Type: text/plain; charset="utf-8" From: Kevin Hao [ Upstream commit 9d724b34fbe13b71865ad0906a4be97571f19cf5 ] 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 dri= ver 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@g= mail.com Signed-off-by: Jakub Kicinski Signed-off-by: Wenshan Lan --- drivers/net/ethernet/ti/cpsw_new.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/ti/cpsw_new.c b/drivers/net/ethernet/ti/c= psw_new.c index c99dde9dbe77..17c267f6d79a 100644 --- a/drivers/net/ethernet/ti/cpsw_new.c +++ b/drivers/net/ethernet/ti/cpsw_new.c @@ -1437,7 +1437,8 @@ static void cpsw_unregister_ports(struct cpsw_common = *cpsw) int i =3D 0; =20 for (i =3D 0; i < cpsw->data.slaves; i++) { - if (!cpsw->slaves[i].ndev) + if (!cpsw->slaves[i].ndev || + cpsw->slaves[i].ndev->reg_state !=3D NETREG_REGISTERED) continue; =20 unregister_netdev(cpsw->slaves[i].ndev); @@ -1457,7 +1458,6 @@ static int cpsw_register_ports(struct cpsw_common *cp= sw) if (ret) { dev_err(cpsw->dev, "cpsw: err registering net device%d\n", i); - cpsw->slaves[i].ndev =3D NULL; break; } } --=20 2.43.0