From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9874CC25B4E for ; Tue, 24 Jan 2023 13:43:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233916AbjAXNnf (ORCPT ); Tue, 24 Jan 2023 08:43:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234375AbjAXNnJ (ORCPT ); Tue, 24 Jan 2023 08:43:09 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C48F346708; Tue, 24 Jan 2023 05:42:35 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 972A1611D7; Tue, 24 Jan 2023 13:42:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A72BC4339C; Tue, 24 Jan 2023 13:42:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674567753; bh=iybTctbjMJ1gz+niId1IJbZDt4T31oDZ7QcrLv+nC6A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jUEnab+JTG4v4+iFT0IiN+rbTMRvVZbY7PBCHmGbnmCXSB/mwFQ3XkMHheolRGwkZ XtFCschGeOzP7p+jG/QF32e/5wQElKFSDq9CsoCjDpOwXFnS0t/DgSp1qlWilq//1W 06ixOc+n2L24/eIIobfetO6xOfmcfEEbwyFi617xciw//5pon1L43y1eNXTqidAKeX QRrEwdXMZnOn+CImYFlepKs8Zh+zapKJcStzop25Qu9nCtExRS4omB8RoW897m+4Qr 79YIO48bqfhQhwsuiCmVj5Zw/ITX4u/PhQqZDh4vH/CMqc4JzzZJ/D+doiLvdBq/KN 6R250563/jjwQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hui Wang , Sascha Hauer , Vinod Koul , Sasha Levin , shawnguo@kernel.org, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 23/35] dmaengine: imx-sdma: Fix a possible memory leak in sdma_transfer_init Date: Tue, 24 Jan 2023 08:41:19 -0500 Message-Id: <20230124134131.637036-23-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230124134131.637036-1-sashal@kernel.org> References: <20230124134131.637036-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: dmaengine@vger.kernel.org From: Hui Wang [ Upstream commit 1417f59ac0b02130ee56c0c50794b9b257be3d17 ] If the function sdma_load_context() fails, the sdma_desc will be freed, but the allocated desc->bd is forgot to be freed. We already met the sdma_load_context() failure case and the log as below: [ 450.699064] imx-sdma 30bd0000.dma-controller: Timeout waiting for CH0 ready ... In this case, the desc->bd will not be freed without this change. Signed-off-by: Hui Wang Reviewed-by: Sascha Hauer Link: https://lore.kernel.org/r/20221130090800.102035-1-hui.wang@canonical.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/imx-sdma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index fbea5f62dd98..b926abe4fa43 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1521,10 +1521,12 @@ static struct sdma_desc *sdma_transfer_init(struct sdma_channel *sdmac, sdma_config_ownership(sdmac, false, true, false); if (sdma_load_context(sdmac)) - goto err_desc_out; + goto err_bd_out; return desc; +err_bd_out: + sdma_free_bd(desc); err_desc_out: kfree(desc); err_out: -- 2.39.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 66341C38142 for ; Tue, 24 Jan 2023 13:49:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=G+wfOqrlXhRkEllN6zDeFgP4hmwMfFjaIsHegGbzDOE=; b=OD3cM2D7Zi6miM pEBMs1WdRHyYCBvUYzl4J+19ODqe4qcWOr8TeMpTQn0pXpJ899ZQOanCqaCVpC1t6yLKCHNf8maQg /OzwmU0cpEo/wIGydXNYUcBpDXlcQaKPoyc/vt/KrB8+4jIBvIVHehyTjsFHyGoREelLSiDzigmoP DPwIR2pauG8/MzDzJuAq7Ml6vk52+7NVKzQhUn8M1QfoOT5vTJPE6UMGyrIn2Qrve1dWECL5pb8V/ DLliX1TCC1+ndt/1uCxLwoKA+o7UuCmzkrhlDA7LdRWsKvvv2O6DVkuHRTJE4ettrC5nVSDLtk6LD S9b5IKHJO/zH6ef/L+9A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKJfK-0044M0-44; Tue, 24 Jan 2023 13:48:46 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pKJZJ-0041BE-P7 for linux-arm-kernel@lists.infradead.org; Tue, 24 Jan 2023 13:42:35 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3200E611FD; Tue, 24 Jan 2023 13:42:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2A72BC4339C; Tue, 24 Jan 2023 13:42:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674567753; bh=iybTctbjMJ1gz+niId1IJbZDt4T31oDZ7QcrLv+nC6A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jUEnab+JTG4v4+iFT0IiN+rbTMRvVZbY7PBCHmGbnmCXSB/mwFQ3XkMHheolRGwkZ XtFCschGeOzP7p+jG/QF32e/5wQElKFSDq9CsoCjDpOwXFnS0t/DgSp1qlWilq//1W 06ixOc+n2L24/eIIobfetO6xOfmcfEEbwyFi617xciw//5pon1L43y1eNXTqidAKeX QRrEwdXMZnOn+CImYFlepKs8Zh+zapKJcStzop25Qu9nCtExRS4omB8RoW897m+4Qr 79YIO48bqfhQhwsuiCmVj5Zw/ITX4u/PhQqZDh4vH/CMqc4JzzZJ/D+doiLvdBq/KN 6R250563/jjwQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hui Wang , Sascha Hauer , Vinod Koul , Sasha Levin , shawnguo@kernel.org, dmaengine@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 6.1 23/35] dmaengine: imx-sdma: Fix a possible memory leak in sdma_transfer_init Date: Tue, 24 Jan 2023 08:41:19 -0500 Message-Id: <20230124134131.637036-23-sashal@kernel.org> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230124134131.637036-1-sashal@kernel.org> References: <20230124134131.637036-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230124_054233_896244_37783CD7 X-CRM114-Status: GOOD ( 12.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Hui Wang [ Upstream commit 1417f59ac0b02130ee56c0c50794b9b257be3d17 ] If the function sdma_load_context() fails, the sdma_desc will be freed, but the allocated desc->bd is forgot to be freed. We already met the sdma_load_context() failure case and the log as below: [ 450.699064] imx-sdma 30bd0000.dma-controller: Timeout waiting for CH0 ready ... In this case, the desc->bd will not be freed without this change. Signed-off-by: Hui Wang Reviewed-by: Sascha Hauer Link: https://lore.kernel.org/r/20221130090800.102035-1-hui.wang@canonical.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/imx-sdma.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index fbea5f62dd98..b926abe4fa43 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -1521,10 +1521,12 @@ static struct sdma_desc *sdma_transfer_init(struct sdma_channel *sdmac, sdma_config_ownership(sdmac, false, true, false); if (sdma_load_context(sdmac)) - goto err_desc_out; + goto err_bd_out; return desc; +err_bd_out: + sdma_free_bd(desc); err_desc_out: kfree(desc); err_out: -- 2.39.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel