Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Laurentiu Tudor <laurentiu.tudor@nxp.com>
To:     linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc:     leoyang.li@nxp.com, youri.querry_1@oss.nxp.com,
        ioana.ciornei@nxp.com, Laurentiu Tudor <laurentiu.tudor@nxp.com>
Subject: [PATCH] soc: dpio: fix cleanup on error
Date:   Mon,  4 Oct 2021 13:09:44 +0300
Message-Id: <20211004100944.15023-1-laurentiu.tudor@nxp.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?XNj0E7tNmF6BEkYD1RhwXyuFMGrkA0+aJW3lu8ILnujoV/Xfh4M6lNOiZckS?=
 =?us-ascii?Q?7AsV5ZSCns2XjeDs155ySgl3qjuUDnpYyjySzr/XaifFqBoOdYz6cJT+CwlC?=
 =?us-ascii?Q?21MhyCp9qeYMD62gYLjE2pcLXHG/Kmvl71iTDQ5DOpwYuHRUh4fMXl3j5CNH?=
 =?us-ascii?Q?gNVkFQzPUFF13EEhvbNRVPjkM56MLm9StRkXaGSBvjHCKSBLH0KgBewbPISQ?=
 =?us-ascii?Q?CkGUT6b40eLFXIqGQ8FJjmdI7w+I3Gjr476YxNFltFGPzWRs5mM90xbqeu0S?=
 =?us-ascii?Q?aJKDDcfOW6fP+pEdbXoA0ONKBqInUiI5KoXkO063uoBgx2qZU8B7pGxjW3XZ?=
 =?us-ascii?Q?9Ziylttl41PxAskBMPrlcKnTZuKUFJMWx2hjrMdWV1qvfPs/aZrtcHjz2cGq?=
 =?us-ascii?Q?KpSD0sYAkgrobgR8thAbJd5h1i8CyREF2OU9qsJ3HTixE1NX1dIk4OGzClUD?=
 =?us-ascii?Q?WDq1IKbXtpjh6DRCc9hS19eDhhmA66Kn9LoT8buwLMvwXhDHh2EWrTlK9B2c?=
 =?us-ascii?Q?LqqqOIws1Ejve5c0gikFemY4YCNL6tbSwsFRP+LRxoS0u4xFZpnxsSaXP7bb?=
 =?us-ascii?Q?vDh9liYOcAqkbK/r+9azHsTdmGGzQ4S6mvteX3dSMfgCDpFbxtwH7GrGbCPL?=
 =?us-ascii?Q?rPOVQYnfMmbPXnPtD2vqhpbQE27ATDTXCvsRem43CN0oafqsnNd0tfG3HoPp?=
 =?us-ascii?Q?ZCQjeu8XAPBJ5mIEKwm0JSR1G3NOdQaJPSnDlwb5gaer+SYZn0VWSju27bFU?=
 =?us-ascii?Q?V1f6OMAvc6iG0rrQsDPq6RD6kpLAPfHWzYP6N10kCncdi8eXbPSLljEmYC7Z?=
 =?us-ascii?Q?nZlBVTdvPUmmfPvhh9WtSv9F37ZFulFZSc6avSDP2JOOqrxP9MQScgQpgVQR?=
 =?us-ascii?Q?BCSR1VWdWUMrQpd5HnWs+ywwLmMgPSrQdKI9s8UJ9J8Lj6zYD27XYZ7UQSTj?=
 =?us-ascii?Q?g6MXCMJ5v+fl/O2bUHVAABkigK/QnutwyVP4QMtAa9rISmZivbltDOH1lrWF?=
 =?us-ascii?Q?UfbtIsUhvYAOcbQPi9ynOzeCjHkNAZ9+5XMv+R9+091nV3mlNa/C6j0u1Fke?=
 =?us-ascii?Q?SoxKwIx5gNvV5/l8M2CiJd5u6IPUAs7gWLsoffxEsVEHkYLL1V78gyRvih8Y?=
 =?us-ascii?Q?po872YdZtMzGyEEkPoaEvwEvmflSEHWJbX1Fk2QcVdindxabL5ITHI4SttaF?=
 =?us-ascii?Q?24CyUeRblusAPrPP7eEKZuw454YOeFLTHhWBsn+69x2SRBdV7uos/nxDr625?=
 =?us-ascii?Q?od9/RTf8jJrp7YUMrnf8wHrKQWZGobZusc8sQI5o0J0PM5FhD/1CtONq7y6j?=
 =?us-ascii?Q?iJ8UmVkKli9YW0W1oPMz3AQj?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 664f360b-dcab-47ae-be40-08d9871f2322
X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3405.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2021 10:10:05.5139
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: osW5x01sp3VVgwp0FJ9inDx03PF4U7Ef3LuX+BkPWuvGp2SkkWYn5p2su3MZOg0Ri0OhfItfW6zbvEOlKigiMQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7231
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

dpaa2_io_service_register() adds an element to a linked list but
doesn't remove it on the error path, leaking it. Fix it.

Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
---
 drivers/soc/fsl/dpio/dpio-service.c | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/drivers/soc/fsl/dpio/dpio-service.c b/drivers/soc/fsl/dpio/dpio-service.c
index 7351f3030550..b42367eb1653 100644
--- a/drivers/soc/fsl/dpio/dpio-service.c
+++ b/drivers/soc/fsl/dpio/dpio-service.c
@@ -278,10 +278,20 @@ int dpaa2_io_service_register(struct dpaa2_io *d,
 	spin_unlock_irqrestore(&d->lock_notifications, irqflags);
 
 	/* Enable the generation of CDAN notifications */
-	if (ctx->is_cdan)
-		return qbman_swp_CDAN_set_context_enable(d->swp,
-							 (u16)ctx->id,
-							 ctx->qman64);
+	if (ctx->is_cdan) {
+		int ret;
+
+		ret = qbman_swp_CDAN_set_context_enable(d->swp, (u16)ctx->id,
+							ctx->qman64);
+		if (ret) {
+			spin_lock_irqsave(&d->lock_notifications, irqflags);
+			list_del(&ctx->node);
+			spin_unlock_irqrestore(&d->lock_notifications,
+					       irqflags);
+
+			return ret;
+		}
+	}
 	return 0;
 }
 EXPORT_SYMBOL_GPL(dpaa2_io_service_register);
-- 
2.17.1