From: Frank Li <Frank.li@nxp.com>
To: Shitalkumar Gandhi <shital.gandhi45@gmail.com>
Cc: gregkh@linuxfoundation.org, jirislaby@kernel.org,
bhuvanchandra.dv@toradex.com, peng.fan@nxp.com,
sherry.sun@nxp.com, linux-serial@vger.kernel.org,
imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org,
Shitalkumar Gandhi <shitalkumar.gandhi@cambiumnetworks.com>
Subject: Re: [PATCH] serial: fsl_lpuart: fix rx buffer and DMA map leaks in start_rx_dma
Date: Mon, 20 Apr 2026 22:33:19 -0400 [thread overview]
Message-ID: <aebh75Od_EfYhbal@lizhi-Precision-Tower-5810> (raw)
In-Reply-To: <20260420135903.2062024-1-shitalkumar.gandhi@cambiumnetworks.com>
On Mon, Apr 20, 2026 at 07:29:03PM +0530, Shitalkumar Gandhi wrote:
> lpuart_start_rx_dma() allocates sport->rx_ring.buf with kzalloc() and
> then maps a scatterlist via dma_map_sg(). On three subsequent error
> paths the function returns directly without releasing those resources:
>
> - when dma_map_sg() returns 0 (-EINVAL):
> ring->buf is leaked.
> - when dmaengine_slave_config() fails:
> ring->buf and the DMA mapping are leaked.
> - when dmaengine_prep_dma_cyclic() returns NULL:
> ring->buf and the DMA mapping are leaked.
>
> The sole cleanup path, lpuart_dma_rx_free(), is only reached when
> lpuart_dma_rx_use is set, and the caller lpuart_rx_dma_startup() clears
> that flag on failure of lpuart_start_rx_dma(). So these resources are
> permanently leaked on every failure in this function. Repeated port
> open/close or termios changes under error conditions will slowly consume
> memory and leave stale streaming DMA mappings behind.
>
> Fix it by introducing two error labels that unmap the scatterlist and
> free the ring buffer as appropriate. While here, replace the misleading
> -EFAULT (bad userspace pointer) returned when dmaengine_prep_dma_cyclic()
> fails with the more accurate -ENOMEM, matching how other dmaengine users
> in the tree treat this failure.
>
> No functional change on the success path.
>
> Fixes: 5887ad43ee02 ("tty: serial: fsl_lpuart: Use cyclic DMA for Rx")
> Cc: stable@vger.kernel.org
>
> Signed-off-by: Shitalkumar Gandhi <shitalkumar.gandhi@cambiumnetworks.com>
> ---
Reviewed-by: Frank Li <Frank.Li@nxp.com>
> drivers/tty/serial/fsl_lpuart.c | 15 ++++++++++++---
> 1 file changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
> index f36d50fe056f..296a096be351 100644
> --- a/drivers/tty/serial/fsl_lpuart.c
> +++ b/drivers/tty/serial/fsl_lpuart.c
> @@ -1376,7 +1376,8 @@ static inline int lpuart_start_rx_dma(struct lpuart_port *sport)
>
> if (!nent) {
> dev_err(sport->port.dev, "DMA Rx mapping error\n");
> - return -EINVAL;
> + ret = -EINVAL;
> + goto err_free_buf;
> }
>
> dma_rx_sconfig.src_addr = lpuart_dma_datareg_addr(sport);
> @@ -1388,7 +1389,7 @@ static inline int lpuart_start_rx_dma(struct lpuart_port *sport)
> if (ret < 0) {
> dev_err(sport->port.dev,
> "DMA Rx slave config failed, err = %d\n", ret);
> - return ret;
> + goto err_unmap_sg;
> }
>
> sport->dma_rx_desc = dmaengine_prep_dma_cyclic(chan,
> @@ -1399,7 +1400,8 @@ static inline int lpuart_start_rx_dma(struct lpuart_port *sport)
> DMA_PREP_INTERRUPT);
> if (!sport->dma_rx_desc) {
> dev_err(sport->port.dev, "Cannot prepare cyclic DMA\n");
> - return -EFAULT;
> + ret = -ENOMEM;
> + goto err_unmap_sg;
> }
>
> sport->dma_rx_desc->callback = lpuart_dma_rx_complete;
> @@ -1423,6 +1425,13 @@ static inline int lpuart_start_rx_dma(struct lpuart_port *sport)
> }
>
> return 0;
> +
> +err_unmap_sg:
> + dma_unmap_sg(chan->device->dev, &sport->rx_sgl, 1, DMA_FROM_DEVICE);
> +err_free_buf:
> + kfree(ring->buf);
> + ring->buf = NULL;
> + return ret;
> }
>
> static void lpuart_dma_rx_free(struct uart_port *port)
> --
> 2.25.1
>
prev parent reply other threads:[~2026-04-21 2:33 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-20 13:59 [PATCH] serial: fsl_lpuart: fix rx buffer and DMA map leaks in start_rx_dma Shitalkumar Gandhi
2026-04-21 2:33 ` Frank Li [this message]
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=aebh75Od_EfYhbal@lizhi-Precision-Tower-5810 \
--to=frank.li@nxp.com \
--cc=bhuvanchandra.dv@toradex.com \
--cc=gregkh@linuxfoundation.org \
--cc=imx@lists.linux.dev \
--cc=jirislaby@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=peng.fan@nxp.com \
--cc=sherry.sun@nxp.com \
--cc=shital.gandhi45@gmail.com \
--cc=shitalkumar.gandhi@cambiumnetworks.com \
--cc=stable@vger.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