From patchwork Mon Nov 11 18:28:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 179111 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp7037275ilf; Mon, 11 Nov 2019 10:44:06 -0800 (PST) X-Google-Smtp-Source: APXvYqxLc3wjlIzn2AfCoUn9jdqUAG5vK1ptrNixjPNTsXSY2PyfRPZm1tlbZHeLZwWuMJ69siJ5 X-Received: by 2002:a17:906:b2c7:: with SMTP id cf7mr16661030ejb.218.1573497846023; Mon, 11 Nov 2019 10:44:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573497846; cv=none; d=google.com; s=arc-20160816; b=Nhe1BfUcq21p07BKmMCRV5aM8chhjW8qQZ1+m/Cq6iDxr1WffOJ7PBkoLnDSUETQch YQ8FVKIy4A44ASYRbe7/2aW2AeruuHEq/R0XftEmt+RfLTxNzgtQzjWF7taPOqtFZ3iW LAc8RtHzH1Ko6Y9+PFskY/S4RwLBaq++JLX0xkOKHD5Hgh59hOFB2Fv92L939KySqz78 Uc/14waXuzhStv/RVuhXkrg3l8FGCUsGNDhbaLfcyLtq/rBFFqZy2Cc51l26BJCZNVsW RjP2mFrR6LdFtPMiLg3/bOIwejdbXMlubkc/ya5/IKes1mOc/vrbNhSJghA4UBKwIq/L cmsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=+0+rLiFD4QvbVWJ3wNwc/OVy5xC0qWj6HSQ1CggMqFE=; b=Xf5dSWIjLIOeeOx3nrPcgZAU+8Jfxs4XCr/fltQMBGJ2aoCqhJbT9rF4RY/iRLbT7a xnHx+v7vc9jyRrQByCjIsLMYE8UpC0weLI3qQbVgEmQXkwPCFT4/JcupU+h7TJaBCiS5 YCMw/h9rit4izqSgIQU5Qu0XP8lljoJr0NQHy4x19B94Q40CVq+FfKUJJ4CtPH0txoS8 rlfhVbAddGYyo4IvWbN9cROYkA0PoU5NfY1MgZYNQ1VY/8rMZXyhPusTOUAbhuYaUsru Vf2Zo4gcYNVBXpCLAUA4tamW9W3Ozjo3q5jCCCxcCwGKi5zUAQ572JzjmaID/Tq4jqI9 0UbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sscScEYy; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h18si11062593edh.352.2019.11.11.10.44.05; Mon, 11 Nov 2019 10:44:06 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sscScEYy; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728149AbfKKSoE (ORCPT + 14 others); Mon, 11 Nov 2019 13:44:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:35602 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728130AbfKKSoD (ORCPT ); Mon, 11 Nov 2019 13:44:03 -0500 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 55BD6204FD; Mon, 11 Nov 2019 18:44:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497841; bh=dywrqtEgRpBStaOON3XI5ekgKLo9hIVBLPXy10+jWHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sscScEYyhU1DXMlrhNckLb9Z9ehXvUR3UZ/FemxJHkID7jebj3rMTeApHbZVouaaE 4W+BEQb7Xw8bwslitM1q3huFJf+vJVJtc+II+62OuYYMzV+WT8DrMvUzN1AsS3nm7+ d3F3/9OfblZrBQQ2hhWdU0AmCXEPH9QH4zMhTafc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Zhenfang Wang , Baolin Wang , Vinod Koul , Sasha Levin Subject: [PATCH 4.19 072/125] dmaengine: sprd: Fix the possible memory leak issue Date: Mon, 11 Nov 2019 19:28:31 +0100 Message-Id: <20191111181449.739146488@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181438.945353076@linuxfoundation.org> References: <20191111181438.945353076@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Baolin Wang [ Upstream commit ec1ac309596a7bdf206743b092748205f6cd5720 ] If we terminate the channel to free all descriptors associated with this channel, we will leak the memory of current descriptor if the current descriptor is not completed, since it had been deteled from the desc_issued list and have not been added into the desc_completed list. Thus we should check if current descriptor is completed or not, when freeing the descriptors associated with one channel, if not, we should free it to avoid this issue. Fixes: 9b3b8171f7f4 ("dmaengine: sprd: Add Spreadtrum DMA driver") Reported-by: Zhenfang Wang Tested-by: Zhenfang Wang Signed-off-by: Baolin Wang Link: https://lore.kernel.org/r/170dbbc6d5366b6fa974ce2d366652e23a334251.1570609788.git.baolin.wang@linaro.org Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/sprd-dma.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) -- 2.20.1 diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c index 1ed1c7efa2885..9e8ce56a83d8a 100644 --- a/drivers/dma/sprd-dma.c +++ b/drivers/dma/sprd-dma.c @@ -181,6 +181,7 @@ struct sprd_dma_dev { struct sprd_dma_chn channels[0]; }; +static void sprd_dma_free_desc(struct virt_dma_desc *vd); static bool sprd_dma_filter_fn(struct dma_chan *chan, void *param); static struct of_dma_filter_info sprd_dma_info = { .filter_fn = sprd_dma_filter_fn, @@ -493,12 +494,19 @@ static int sprd_dma_alloc_chan_resources(struct dma_chan *chan) static void sprd_dma_free_chan_resources(struct dma_chan *chan) { struct sprd_dma_chn *schan = to_sprd_dma_chan(chan); + struct virt_dma_desc *cur_vd = NULL; unsigned long flags; spin_lock_irqsave(&schan->vc.lock, flags); + if (schan->cur_desc) + cur_vd = &schan->cur_desc->vd; + sprd_dma_stop(schan); spin_unlock_irqrestore(&schan->vc.lock, flags); + if (cur_vd) + sprd_dma_free_desc(cur_vd); + vchan_free_chan_resources(&schan->vc); pm_runtime_put(chan->device->dev); } @@ -814,15 +822,22 @@ static int sprd_dma_resume(struct dma_chan *chan) static int sprd_dma_terminate_all(struct dma_chan *chan) { struct sprd_dma_chn *schan = to_sprd_dma_chan(chan); + struct virt_dma_desc *cur_vd = NULL; unsigned long flags; LIST_HEAD(head); spin_lock_irqsave(&schan->vc.lock, flags); + if (schan->cur_desc) + cur_vd = &schan->cur_desc->vd; + sprd_dma_stop(schan); vchan_get_all_descriptors(&schan->vc, &head); spin_unlock_irqrestore(&schan->vc.lock, flags); + if (cur_vd) + sprd_dma_free_desc(cur_vd); + vchan_dma_desc_free_list(&schan->vc, &head); return 0; }