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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90515C433E0 for ; Thu, 18 Jun 2020 01:41:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 71680221F0 for ; Thu, 18 Jun 2020 01:41:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592444483; bh=KmSUVlMa13l+Nhum3qtgOa0Jxn2Jqu5WF3Tx7LIfQns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AKwnXqFuFs9ilQ6XCcJdD1+4PNq3h1TG0N0o1ooctkeoM9zJlqGcqrrmDvOVKKAUb aysOv65X88/vT1sozpli+bGRt3ip/iYertkJqWpeFMyz8ajLeBqIDWDzxnLgxXZZiL pZ3QJi8lSspT0pZqgleLLQEIRUpopcT5SQT6JA6s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728425AbgFRBlV (ORCPT ); Wed, 17 Jun 2020 21:41:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:39402 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731767AbgFRB3t (ORCPT ); Wed, 17 Jun 2020 21:29:49 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9962E2223F; Thu, 18 Jun 2020 01:29:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443788; bh=KmSUVlMa13l+Nhum3qtgOa0Jxn2Jqu5WF3Tx7LIfQns=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m3YWR3NYALqgRSgUGwrWGh726V+JJb2/2Utpj9jP2mqykhU959F8YVsj66iUb6MYT beSgBTb+AVjOejzS0bsfxTQgLEhDtQTTY4UjJ2qZMvOk8hNvPiYwK8nyetgCPkwYxc LgwqD2u2/7JYjazpv60giCxjwVA0L6o/EvQr26kw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Xiyu Yang , Xin Tan , Mark Brown , Sasha Levin , alsa-devel@alsa-project.org, linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 4.9 69/80] ASoC: fsl_asrc_dma: Fix dma_chan leak when config DMA channel failed Date: Wed, 17 Jun 2020 21:28:08 -0400 Message-Id: <20200618012819.609778-69-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618012819.609778-1-sashal@kernel.org> References: <20200618012819.609778-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xiyu Yang [ Upstream commit 36124fb19f1ae68a500cd76a76d40c6e81bee346 ] fsl_asrc_dma_hw_params() invokes dma_request_channel() or fsl_asrc_get_dma_channel(), which returns a reference of the specified dma_chan object to "pair->dma_chan[dir]" with increased refcnt. The reference counting issue happens in one exception handling path of fsl_asrc_dma_hw_params(). When config DMA channel failed for Back-End, the function forgets to decrease the refcnt increased by dma_request_channel() or fsl_asrc_get_dma_channel(), causing a refcnt leak. Fix this issue by calling dma_release_channel() when config DMA channel failed. Signed-off-by: Xiyu Yang Signed-off-by: Xin Tan Link: https://lore.kernel.org/r/1590415966-52416-1-git-send-email-xiyuyang19@fudan.edu.cn Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/fsl/fsl_asrc_dma.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sound/soc/fsl/fsl_asrc_dma.c b/sound/soc/fsl/fsl_asrc_dma.c index dc30d780f874..3fcf174b99d3 100644 --- a/sound/soc/fsl/fsl_asrc_dma.c +++ b/sound/soc/fsl/fsl_asrc_dma.c @@ -243,6 +243,7 @@ static int fsl_asrc_dma_hw_params(struct snd_pcm_substream *substream, ret = dmaengine_slave_config(pair->dma_chan[dir], &config_be); if (ret) { dev_err(dev, "failed to config DMA channel for Back-End\n"); + dma_release_channel(pair->dma_chan[dir]); return ret; } -- 2.25.1