Received-SPF: pass (google.com: domain of linux-kernel+bounces-141584-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Frank Li <Frank.Li@nxp.com>
To: Vinod Koul <vkoul@kernel.org>,
	imx@lists.linux.dev (open list:FREESCALE eDMA DRIVER),
	dmaengine@vger.kernel.org (open list:FREESCALE eDMA DRIVER),
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 1/1] dmaengine: fsl-edma: fix miss mutex unlock at an error return path
Date: Thu, 11 Apr 2024 16:39:35 -0400
Message-Id: <20240411203935.3137158-1-Frank.Li@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?DsUaj/G2RT4uaAN0g3A1z0A+DM1jwXUpNVH1hL1NyZj8nHEU4tdSjlN24qF9?=
 =?us-ascii?Q?bXkRlVkJacY/VtUffDbUc2YiEBZG559oMa8eutT9JRJl/t8+jnPDMN3LQbL4?=
 =?us-ascii?Q?Eis4+7HzjytaF/3ITyTizVJj4aeR7YW3SpcCh1AiaCyZLg8Essj2wKG14pfi?=
 =?us-ascii?Q?oFDGuKnVv5BAWm4fjIRWJNVwY5x6bEXKYB63lQafy01oIn3APrg6CzQ7vwoZ?=
 =?us-ascii?Q?Ow9t77r42loA5/c625Y3e5MwYs0YbjQBm1AAQP9kd9IMFYrdtJ+imKw7NJVL?=
 =?us-ascii?Q?kd41YmrbsqpSOE4auxVyfbTZFBN6U0XG2ZnbWcpRjNcoHCPyZimS7OSzEC5+?=
 =?us-ascii?Q?1jGmLyKOjoaz7vw0WCL51E/H2c9lZWS7BrbHLTwopZSiBB4ksQloqqetDh5/?=
 =?us-ascii?Q?2KUro4beZlKkw4l6qyZF+7Qxrb4Lw74seqC2X3FL/5gOe9yIOxFJnzIz0u9l?=
 =?us-ascii?Q?IsCJberfIHBeo1Pq0dDC9M7LKiSy0oUpG/JCb+IvmfLEhV+PNG7o8nWtkTfU?=
 =?us-ascii?Q?W3/SpLJAQKV2MrxyXTqM8Qn/4bYQOmn/6vks783Y7iAt3FeAxTgPp37niJj1?=
 =?us-ascii?Q?tnbapmz6ElPDXWhFNiFGi13+WMHXeptb3ycZA14N3VZ3R/x+jezF2uetOeVH?=
 =?us-ascii?Q?b7x9pBN0zqoHl4XcTqCDbD2m9Z3g5giq4CfmD0LO/nF4RfKax19ySc29zTvC?=
 =?us-ascii?Q?wYJ6b/M7MZZpcDO/9yQsTHXntvmTMB9dXJdxH4oWQ00p4JGudDBBbJuKChF/?=
 =?us-ascii?Q?1tCf0E4eGuAyaTFEl9PxR/9355s0BRrFEleF4cmA1YKkseU7lavy/LgnEO7x?=
 =?us-ascii?Q?BbIe9Pkz8qG6oxzF8HJEfpQ3Zp0Smp/RqpDw12zGWsPr0ng2txo4KyylRrjw?=
 =?us-ascii?Q?CR/EPaqs0kcfbAlm9xeIGE+o1TmPU+XOyFpnrWgkMDJ3hcyRDDhZKH7iKdUz?=
 =?us-ascii?Q?6QBBo2w7x525Ic8q2maXWl0CrbSPWtL0HtcQXqvcWvsstMWliYwnAUKprjBJ?=
 =?us-ascii?Q?taB01fQrfjonVtLhTdTv8eGpTwREzOkCbVDC7b2PG1KiW65JeFL06WiPes36?=
 =?us-ascii?Q?DcTCJh+4JhDFPzMGHrZW919QZA+2EsvUFtcndPyN/mcqSj7mS/c3x+7RNY3g?=
 =?us-ascii?Q?gCYorUD4KYgFN9YrzKiz++JH+exPhxqzsIe20vZBajdwty0VrDknwR6KqHFg?=
 =?us-ascii?Q?7R8nhHRYDk4lHynVp2sFtBkdc2iZSn4cltJRgtna/0uHvJqkVRpV0Iw1XN8H?=
 =?us-ascii?Q?gOxJGR6O/0Mv5n+DHZQwSjYhfLJPMZ20sV4z1HJVGGtb90p42Ljm/5wGjOJZ?=
 =?us-ascii?Q?XxQSqOEAFFDkSxr1AwMcBkUx4HvaYeSzXqyhEDZQAug4Oy9xAQVM8hlewih/?=
 =?us-ascii?Q?17wIENn2VB31kmIyNpAYezgppTyPs5TZbBb5D2HFafXnswYnxo33IqKR8KdC?=
 =?us-ascii?Q?gvqONkPzScCl7sM/wy7/V503rhHE3jvwdHoAGNPBjYXuHPwNA/EjwhidNGAt?=
 =?us-ascii?Q?svcaE3fXnABaG5hBpkftlypBnCg/Z+/Zyzjjl0T4AMvk/dY4pL58urP4jzBc?=
 =?us-ascii?Q?5vODAAQLZ77VoGrySCmPorxYaxT2kPY3T01MTvKl?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: df256812-52da-4021-f650-08dc5a678776
X-MS-Exchange-CrossTenant-AuthSource: DB9PR04MB9626.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2024 20:39:48.2036
 (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: cUP8VzKLElJ3yPPBNh6szValDQ/W0omHvMUG21/ZE5TDcm6rjoHSRO4TheWQpXsRGCuUTQh5lcZu8mToi0wKIw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9274

Use cleanup to manage mutex. Let compiler to do scope guard automatically.

Fixes: 6aa60f79e679 ("dmaengine: fsl-edma: add safety check for 'srcid'")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/r/202404110915.riwV3ZAC-lkp@intel.com/
Signed-off-by: Frank Li <Frank.Li@nxp.com>
---
 drivers/dma/fsl-edma-common.c | 1 +
 drivers/dma/fsl-edma-main.c   | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/dma/fsl-edma-common.c b/drivers/dma/fsl-edma-common.c
index f9144b0154396..73628eac8aadc 100644
--- a/drivers/dma/fsl-edma-common.c
+++ b/drivers/dma/fsl-edma-common.c
@@ -3,6 +3,7 @@
 // Copyright (c) 2013-2014 Freescale Semiconductor, Inc
 // Copyright (c) 2017 Sysam, Angelo Dureghello  <angelo@sysam.it>
 
+#include <linux/cleanup.h>
 #include <linux/clk.h>
 #include <linux/dmapool.h>
 #include <linux/module.h>
diff --git a/drivers/dma/fsl-edma-main.c b/drivers/dma/fsl-edma-main.c
index 755a3dc3b0a78..de03148aed0b3 100644
--- a/drivers/dma/fsl-edma-main.c
+++ b/drivers/dma/fsl-edma-main.c
@@ -105,7 +105,8 @@ static struct dma_chan *fsl_edma_xlate(struct of_phandle_args *dma_spec,
 	if (dma_spec->args_count != 2)
 		return NULL;
 
-	mutex_lock(&fsl_edma->fsl_edma_mutex);
+	guard(mutex)(&fsl_edma->fsl_edma_mutex);
+
 	list_for_each_entry_safe(chan, _chan, &fsl_edma->dma_dev.channels, device_node) {
 		if (chan->client_count)
 			continue;
@@ -124,12 +125,10 @@ static struct dma_chan *fsl_edma_xlate(struct of_phandle_args *dma_spec,
 
 				fsl_edma_chan_mux(fsl_chan, fsl_chan->srcid,
 						true);
-				mutex_unlock(&fsl_edma->fsl_edma_mutex);
 				return chan;
 			}
 		}
 	}
-	mutex_unlock(&fsl_edma->fsl_edma_mutex);
 	return NULL;
 }
 
-- 
2.34.1