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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 C8AF4C433DF for ; Tue, 23 Jun 2020 20:01:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 84CB320E65 for ; Tue, 23 Jun 2020 20:01:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942480; bh=15KNS2QKNsW3XZQIRa77TDYkY3Roqtf5RboAazNsZs8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UK1NxudPTmfUqH3Pvukp/EUnJIzCLiVQiLrSwfgGC00wpY1UHRTxe6jM8BG9aPHBl La9aYa5H54t7Db5w3kKYqarrg962Z0/9oNAGOdd6UxQ0r3eFpSkd7b0dMw28W+uKa/ pSW46vzBgQ1ljISubsMFyy4nqKc4ka9FjQkyschY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387625AbgFWUBT (ORCPT ); Tue, 23 Jun 2020 16:01:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:37784 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387589AbgFWUBS (ORCPT ); Tue, 23 Jun 2020 16:01:18 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1058720706; Tue, 23 Jun 2020 20:01:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592942478; bh=15KNS2QKNsW3XZQIRa77TDYkY3Roqtf5RboAazNsZs8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wk8rWaYt7iRhztsZuJbnaJzTeJEeLlXvZTmoU+GgqCmERvieIvupGXgSOv9FU5Q16 0spfSNvQULlhAn5ocHp3g6kte9uOs7kpkvQRwUK/T1QbhMUekyWSNbDOMJuPLi2SMv 2Xne7A5wrnwKSBpcqZhd2f5C0/W9OWwCWTUrOr4w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiyu Yang , Xin Tan , Peter Ujfalusi , Mark Brown , Sasha Levin Subject: [PATCH 5.7 015/477] ASoC: davinci-mcasp: Fix dma_chan refcnt leak when getting dma type Date: Tue, 23 Jun 2020 21:50:12 +0200 Message-Id: <20200623195408.319525981@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Xiyu Yang [ Upstream commit a697ae6ea56e23397341b027098c1b11d9ab13da ] davinci_mcasp_get_dma_type() invokes dma_request_chan(), which returns a reference of the specified dma_chan object to "chan" with increased refcnt. When davinci_mcasp_get_dma_type() returns, local variable "chan" becomes invalid, so the refcount should be decreased to keep refcount balanced. The reference counting issue happens in one exception handling path of davinci_mcasp_get_dma_type(). When chan device is NULL, the function forgets to decrease the refcnt increased by dma_request_chan(), causing a refcnt leak. Fix this issue by calling dma_release_channel() when chan device is NULL. Signed-off-by: Xiyu Yang Signed-off-by: Xin Tan Acked-by: Peter Ujfalusi Link: https://lore.kernel.org/r/1587818916-38730-1-git-send-email-xiyuyang19@fudan.edu.cn Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/ti/davinci-mcasp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c index 734ffe925c4db..7a7db743dc5b5 100644 --- a/sound/soc/ti/davinci-mcasp.c +++ b/sound/soc/ti/davinci-mcasp.c @@ -1896,8 +1896,10 @@ static int davinci_mcasp_get_dma_type(struct davinci_mcasp *mcasp) PTR_ERR(chan)); return PTR_ERR(chan); } - if (WARN_ON(!chan->device || !chan->device->dev)) + if (WARN_ON(!chan->device || !chan->device->dev)) { + dma_release_channel(chan); return -EINVAL; + } if (chan->device->dev->of_node) ret = of_property_read_string(chan->device->dev->of_node, -- 2.25.1