From: <Tudor.Ambarus@microchip.com>
To: <pavel@ucw.cz>, <linux-kernel@vger.kernel.org>,
<dmaengine@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>,
<dan.j.williams@intel.com>, <vkoul@kernel.org>,
<Ludovic.Desroches@microchip.com>, <stable@vger.kernel.org>,
<greg@kroah.com>
Subject: Re: [PATCH 4.19] dmaengine: at_hdmac: Fix memory leak
Date: Wed, 23 Sep 2020 08:13:02 +0000 [thread overview]
Message-ID: <80065eac-7dce-aadf-51ef-9a290973b9ec@microchip.com> (raw)
In-Reply-To: <20200920082838.GA813@amd>
Hi, Pavel,
On 9/20/20 11:28 AM, Pavel Machek wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> This fixes memory leak in at_hdmac. Mainline does not have the same
> problem.
>
> Signed-off-by: Pavel Machek (CIP) <pavel@denx.de>
>
> diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c
> index 86427f6ba78c..0847b2055857 100644
> --- a/drivers/dma/at_hdmac.c
> +++ b/drivers/dma/at_hdmac.c
> @@ -1714,8 +1714,10 @@ static struct dma_chan *at_dma_xlate(struct of_phandle_args *dma_spec,
> atslave->dma_dev = &dmac_pdev->dev;
>
> chan = dma_request_channel(mask, at_dma_filter, atslave);
> - if (!chan)
> + if (!chan) {
> + kfree(atslave);
> return NULL;
> + }
Thanks for submitting this to stable. While the fix is good, you can instead
cherry-pick the commit that hit upstream. In order to do that cleanly on top
of v4.19.145, you have to pick two other fixes:
commit a6e7f19c9100 ("dmaengine: at_hdmac: Substitute kzalloc with kmalloc")
commit 3832b78b3ec2 ("dmaengine: at_hdmac: add missing put_device() call in at_dma_xlate()")
commit a6e7f19c9100 ("dmaengine: at_hdmac: Substitute kzalloc with kmalloc")
There are also some locking/deadlock fixes in mainline for this driver,
depending on the time you can allocate for this, the list of patches can increase.
I should have Cc'ed stable@vger.kernel.org in the first place, my bad.
Also it may worth to read the rules for submitting to stable at:
https://www.kernel.org/doc/html/latest/process/stable-kernel-rules.html
Cheers,
ta
next prev parent reply other threads:[~2020-09-23 8:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-20 8:28 [PATCH 4.19] dmaengine: at_hdmac: Fix memory leak Pavel Machek
2020-09-23 6:39 ` Ludovic Desroches
2020-09-23 8:13 ` Tudor.Ambarus [this message]
2020-09-23 8:19 ` Tudor.Ambarus
2021-01-04 11:02 ` Greg KH
2021-01-05 8:03 ` Tudor.Ambarus
2021-01-06 16:53 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=80065eac-7dce-aadf-51ef-9a290973b9ec@microchip.com \
--to=tudor.ambarus@microchip.com \
--cc=Ludovic.Desroches@microchip.com \
--cc=dan.j.williams@intel.com \
--cc=dmaengine@vger.kernel.org \
--cc=greg@kroah.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=stable@vger.kernel.org \
--cc=vkoul@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox