From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 193094508E4; Tue, 16 Jun 2026 16:40:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781628014; cv=none; b=uGvB5iUtGCawMNd/+NKdxUnWsB/56n4kdQJJDhPTSAf6MUEKvcUEnJbNCJdrOt+mwKHA4DTPHLud+snYPYf0GU6O3doM6HDbqp9r1gJQwq7VFfezJyazvKJF2Uqv+izYrysMjrGEAlOzVPyh9m291ym5tQ9ddx13cwyfQjhlJr8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781628014; c=relaxed/simple; bh=jsS2zH24/dng9iE1ypfvX/hbW789SWeOpHnSIAkI/4M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bP+w0zj1x5qsxnZJ2rWbtcKJ7lf4vfwHaDxqTjP6FIqbbQ0crpRh5FcyQdDpTy3yXGx2/+vA0XatVJWA9YkqWG79ahNA6KhIlBdNH4vYenRea1lmlkfdGJR1+MJ+ZmiT6FvhbOJ6OYDfzYTHtyXSJPVECWLN6O6ew/HgagLaI+0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=K3pUHIhZ; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="K3pUHIhZ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A2601F000E9; Tue, 16 Jun 2026 16:40:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781628013; bh=3uz1PY40X7x1qNOWFt+hLKnov2M7XrYhUu3G/w1VeXQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=K3pUHIhZaAHLIXP678tpLC3S4ZVud1uK73EN8/n/XuNhJ6UFXLO/K2fJYnPL7A0pO 5UYS41e0sU/sl2vqKSTSMIVPiRBq3clTHjy2Iz48Sd6JjLlI7ZVazAecJt+5WpQAZe 6Ad5QmjnWw5Arb7Hp6fZmQvpYyZgw8tv6+ej/qe0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kevin Hao , Alexander Sverdlin , Jakub Kicinski , Wenshan Lan , Sasha Levin Subject: [PATCH 6.6 007/452] net: cpsw_new: Fix potential unregister of netdev that has not been registered yet Date: Tue, 16 Jun 2026 20:23:54 +0530 Message-ID: <20260616145118.180308795@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145117.796205997@linuxfoundation.org> References: <20260616145117.796205997@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ 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 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 Signed-off-by: Wenshan Lan Signed-off-by: Sasha Levin --- 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/cpsw_new.c index 1f98044b3666ff..64f527ba9a4746 100644 --- a/drivers/net/ethernet/ti/cpsw_new.c +++ b/drivers/net/ethernet/ti/cpsw_new.c @@ -1442,7 +1442,8 @@ static void cpsw_unregister_ports(struct cpsw_common *cpsw) int i = 0; for (i = 0; i < cpsw->data.slaves; i++) { - if (!cpsw->slaves[i].ndev) + if (!cpsw->slaves[i].ndev || + cpsw->slaves[i].ndev->reg_state != NETREG_REGISTERED) continue; unregister_netdev(cpsw->slaves[i].ndev); @@ -1462,7 +1463,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.53.0