From nobody Mon Jun 8 06:36:21 2026 Received: from m16.mail.163.com (m16.mail.163.com [117.135.210.2]) (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 58914346A0B; Mon, 1 Jun 2026 07:38:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=117.135.210.2 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780299522; cv=none; b=UmLX/OyV3EvsW9ZHOQNeUlJIYOMmAWG2c+Iwv59XBGIr0J+apZzMM40fOT3smB6jsto9lA7uCgkzU3idPU1dVUzOPd2WyBijEEiS4+INBXrE37GG7ghd/4P7au9+5MmtFAUEUhLGBohXFgTAvutfn4dsMjyneYpO7mfeNUqavqo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780299522; c=relaxed/simple; bh=2yuERC0w0nuLV7GbKdVOdx0oS2BPdFl4X1xUjG0Ef6k=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=B4BPtL1//ZRqshZBpV6BUzbcTZxNYSo+v+PJp5RocgLPJcw0hHdvvWjnA7TuG4/h6Ty7StPBQGoRcsfuuLzukYXUAIeqUZ7XMEdN3hzjog8+E+H5zSxQ8ccawDVnrQzqmpv8XGKNKtTun5wvBAcWSVlc3bM8Ey5WbXHEZPYOPP0= 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=ebf5L0hK; arc=none smtp.client-ip=117.135.210.2 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="ebf5L0hK" 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=hm T4AIPgEo68prmsXkRcpooHN7WO/b5izamdHrZwu80=; b=ebf5L0hKzJSbjiwQ6+ q/o/fuiozlsvKO4jhLpXEZUHa2j7C0yx2dP2mu+dAKFCzuylN3A0z5oQp1IuOCn7 K1kEYxTgnGTW4Iy/WLpIM0WxoQ2d5m9jQwyGflYVsFAEg8MjwIh/rK6Ewgsv1sV4 BRz1wrPHtyf9RslKzmoEm4f84= Received: from China-163-team (unknown []) by gzga-smtp-mtada-g0-0 (Coremail) with SMTP id _____wDnL1_lNh1qwo_TAg--.52807S2; Mon, 01 Jun 2026 15:38:15 +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 5.15.y] net: cpsw_new: Fix potential unregister of netdev that has not been registered yet Date: Mon, 1 Jun 2026 15:38:11 +0800 Message-ID: <20260601073811.73430-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: _____wDnL1_lNh1qwo_TAg--.52807S2 X-Coremail-Antispam: 1Uf129KBjvJXoW7Ar15Gr4DWFWUtF1ruFWDCFg_yoW8Cw4xpr 48Ka4F9a10qr4vqwsrJa4UJFW5W3W2q3s3ur9rCa4Svr4Dtry5tF1DXFyagFyUArWxCF4Y yw1Yvw1vva4DAaDanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0pij-e5UUUUU= X-CM-SenderInfo: xmhwztjqz6il2tof0z/xtbCxAipcmodNui1jAAA3H 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 9d52b949ae3f..bef2c71b9059 100644 --- a/drivers/net/ethernet/ti/cpsw_new.c +++ b/drivers/net/ethernet/ti/cpsw_new.c @@ -1447,7 +1447,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); @@ -1467,7 +1468,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