From: Tudor Ambarus <tudor.ambarus@linaro.org>
To: Dan Carpenter <dan.carpenter@linaro.org>,
Maxime Ripard <mripard@kernel.org>,
Ludovic Desroches <ludovic.desroches@microchip.com>
Cc: Vinod Koul <vkoul@kernel.org>,
dmaengine@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] dmaengine: at_xdmac: fix potential Oops in at_xdmac_prep_interleaved()
Date: Wed, 17 May 2023 08:35:21 +0100 [thread overview]
Message-ID: <ac65ea9c-12a9-a5d0-5023-8935d780cdf2@linaro.org> (raw)
In-Reply-To: <21282b66-9860-410a-83df-39c17fcf2f1b@kili.mountain>
On 5/15/23 11:32, Dan Carpenter wrote:
> There are two place if the at_xdmac_interleaved_queue_desc() fails which
> could lead to a NULL dereference where "first" is NULL and we call
> list_add_tail(&first->desc_node, ...). In the first caller, the return
> is not checked so add a check for that. In the next caller, the return
> is checked but if it fails on the first iteration through the loop then
> it will lead to a NULL pointer dereference.
>
> Fixes: 4e5385784e69 ("dmaengine: at_xdmac: handle numf > 1")
> Fixes: 62b5cb757f1d ("dmaengine: at_xdmac: fix memory leak in interleaved mode")
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org>
> ---
> drivers/dma/at_xdmac.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c
> index 7da6d9b6098e..c3b37168b21f 100644
> --- a/drivers/dma/at_xdmac.c
> +++ b/drivers/dma/at_xdmac.c
> @@ -1102,6 +1102,8 @@ at_xdmac_prep_interleaved(struct dma_chan *chan,
> NULL,
> src_addr, dst_addr,
> xt, xt->sgl);
> + if (!first)
> + return NULL;
>
> /* Length of the block is (BLEN+1) microblocks. */
> for (i = 0; i < xt->numf - 1; i++)
> @@ -1132,8 +1134,9 @@ at_xdmac_prep_interleaved(struct dma_chan *chan,
> src_addr, dst_addr,
> xt, chunk);
> if (!desc) {
> - list_splice_tail_init(&first->descs_list,
> - &atchan->free_descs_list);
> + if (first)
> + list_splice_tail_init(&first->descs_list,
> + &atchan->free_descs_list);
> return NULL;
> }
>
next prev parent reply other threads:[~2023-05-17 7:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-15 10:32 [PATCH] dmaengine: at_xdmac: fix potential Oops in at_xdmac_prep_interleaved() Dan Carpenter
2023-05-17 7:35 ` Tudor Ambarus [this message]
2023-05-19 11:24 ` Vinod Koul
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=ac65ea9c-12a9-a5d0-5023-8935d780cdf2@linaro.org \
--to=tudor.ambarus@linaro.org \
--cc=dan.carpenter@linaro.org \
--cc=dmaengine@vger.kernel.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=ludovic.desroches@microchip.com \
--cc=mripard@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.