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 E57D5372231; Sat, 28 Feb 2026 17:58:06 +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=1772301487; cv=none; b=eSOGZvFiz8nrXWeoYKH07QgczDxwjzsTC+EZz/f7HP5FR+vg0eiIvKotlsOiIeqA1OCgMZup5JUV4QLN9ZRB8T6d1s56977URHRMrwQuvGfcCgB2+erBaSXuBhV+P0XVoP5vmsf4KqmSC4hm0NuP0uiI0czEifCDOf5MrCPW5Wc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772301487; c=relaxed/simple; bh=brWEGKFHYTDj7z0hOhO6F1iJ08IknFAmGoEN4PhnrK8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dJTN6+4fCfP4TG5451C8iADrh9x/DjY4mvMQJCXwyyK1hgUDXpTpBHIgEngTruXvkrr5QirfAHppRkS4DeXqQGd/+HrVBL1NebdSJ23G9CddsR15pMmr2DeHkzTGzyzo5csy4PcyDAKxzMBg2v5K3Hvnc4t3nYMWUksL8Q+kN2Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=V1QOMWMf; 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="V1QOMWMf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F05AC19425; Sat, 28 Feb 2026 17:58:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772301486; bh=brWEGKFHYTDj7z0hOhO6F1iJ08IknFAmGoEN4PhnrK8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V1QOMWMfRmWcQBxPzXG+h4Lci9dIZCRgin3nvql1TEaQsAVKuBSy8djq8CxFmd6Wu iRNJT+KVuYw6YqreOt+igiqC/XcYQUEydDOcQDZ3HOC54/R7unPplGRy8z6OotREFp BqWVGY5zG+e602zoV7z19x/Oy0yBmqAocl1EMqxyB/v+l9eIXmcgIiSJg0fQf8sZ8M bK7c4WlQdCjl9X+0Kl0vhReYtoFFIql9JmTwMwoetR5q1VgWx05D3n9m0/GdUsJIoO De7IysEHtTa3ro7EXclfFJTg7wI8pgbto+0Nh9XrJFlbeYkx4dbhfnkw/byOAYRw2e RPKvBPFeYHgmA== From: Sasha Levin To: patches@lists.linux.dev Cc: Kevin Hao , stable@vger.kernel.org, Alexander Sverdlin , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.18 672/752] net: cpsw_new: Fix potential unregister of netdev that has not been registered yet Date: Sat, 28 Feb 2026 12:46:23 -0500 Message-ID: <20260228174750.1542406-672-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228174750.1542406-1-sashal@kernel.org> References: <20260228174750.1542406-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit 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: Sasha Levin --- 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 4d763e571cfa9..fd3931d667021 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