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 D9C004E0B66; Wed, 30 Sep 2026 15:36:51 +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=1790782618; cv=none; b=jL9G7vbHKWhUN1e/n4/iQM73Em8I7ON8SqoGUczPfDwE3v/+JXyvKkjKrxuSv0QTo8fthCra+9FfRaP42HE1QPtx1rCaIH+HO74/7ZgEfQBUl2ZsG4j5LdpsDIVW6QkucS/oTNF6mERUG+/XM5VnlYnZmeZqqPgvYzzp/5Ew7MU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790782618; c=relaxed/simple; bh=d8WTajSMy92FkRY+NNyG1WkIn+a0PMTQnrwplD/UUdY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PP97fMwmwC6xXlhb00uLce3lr8EOMam+pU92cAP5oilP3On9qlsmv45g80hkiMrU9rLtDBXVsG8Ca8x+5ELk+Lksd3Fy38Bl+/6EoXCh9lfNOpPUS42IEldsDT0N+a/mjXD5CjIUkZ7NkvHMOEapqepylZ+953yrk8Du9223wGs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=fWRmzaah; 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="fWRmzaah" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D42E1F000FF; Wed, 30 Sep 2026 15:36:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790782607; bh=adVkXOQwLoB+OxnkA6h5uSRCDOgqGdVWBujp9LEpBxg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fWRmzaahoZLg+3vC3g0Nm4/mNo3WIAzf7utK+buFXMM2ntAGi1Z7gIA00NxVg9O3c JFPsAz+VZ21Zp873PLHeH1iFgfHzNX8BU/ZFXKZg1+Xpa1RIQ0esbeWKIzPj7ZRn6P fsH0fzElc22CdSCgmhj/R2L1ED3kDmED2co2dvCI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Aleksandr Loktionov , Alexander Sverdlin , Guangshuo Li , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.10 104/595] net: cpsw_new: unregister devlink on port registration failure Date: Wed, 30 Sep 2026 17:19:57 +0200 Message-ID: <20260930152349.974554969@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152347.700140858@linuxfoundation.org> References: <20260930152347.700140858@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 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Guangshuo Li [ Upstream commit b64f763b607426ac97e44b114f0b8844ac3b86dd ] cpsw_probe() registers devlink before registering the CPSW ports. If cpsw_register_ports() fails, the error path only unregisters the notifiers and then releases the lower level resources. It does not undo the successful cpsw_register_devlink() call, leaving the devlink instance and its parameters registered after probe has failed. Add a devlink cleanup label for the path where devlink registration has already succeeded, and use it when port registration fails. Reviewed-by: Aleksandr Loktionov Reviewed-by: Alexander Sverdlin Signed-off-by: Guangshuo Li Link: https://patch.msgid.link/20260604043115.1409134-1-lgs201920130244@gmail.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/ti/cpsw_new.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/ti/cpsw_new.c b/drivers/net/ethernet/ti/cpsw_new.c index cc276241f3916..83de759bfb90a 100644 --- a/drivers/net/ethernet/ti/cpsw_new.c +++ b/drivers/net/ethernet/ti/cpsw_new.c @@ -2029,7 +2029,7 @@ static int cpsw_probe(struct platform_device *pdev) ret = cpsw_register_ports(cpsw); if (ret) - goto clean_unregister_notifiers; + goto clean_unregister_devlink; dev_notice(dev, "initialized (regs %pa, pool size %d) hw_ver:%08X %d.%d (%d)\n", &ss_res->start, descs_pool_size, @@ -2041,6 +2041,8 @@ static int cpsw_probe(struct platform_device *pdev) return 0; +clean_unregister_devlink: + cpsw_unregister_devlink(cpsw); clean_unregister_notifiers: cpsw_unregister_notifiers(cpsw); clean_cpts: -- 2.53.0