linux-kernel - Re: [PATCH] tty: serial: fsl_lpuart: Fix Tx DMA edge case

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <a93b300237eef1e9a02f680e96449504@agner.ch>
Date:   Fri, 07 Oct 2016 11:06:25 -0700
From:   Stefan Agner <stefan@...er.ch>
To:     Aaron Brice <aaron.brice@...asoft.com>, gregkh@...uxfoundation.org
Cc:     jslaby@...e.com, bhuvanchandra.dv@...adex.com,
        linux-serial@...r.kernel.org, linux-kernel@...r.kernel.org,
        linux-arm-kernel@...ts.infradead.org
Subject: Re: [PATCH] tty: serial: fsl_lpuart: Fix Tx DMA edge case

On 2016-10-06 15:13, Aaron Brice wrote:
> In the case where head == 0 on the circular buffer, there should be one
> DMA buffer, not two.  The second zero-length buffer would break the
> lpuart driver, transfer would never complete.

That looks right, and seems to work fine here:

Acked-by: Stefan Agner <stefan@...er.ch>
Tested-by: Stefan Agner <stefan@...er.ch>

@Greg, would be good if this would still make it into 4.9.

--
Stefan

> 
> Signed-off-by: Aaron Brice <aaron.brice@...asoft.com>
> ---
>  drivers/tty/serial/fsl_lpuart.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c
> index de9d510..76103f2 100644
> --- a/drivers/tty/serial/fsl_lpuart.c
> +++ b/drivers/tty/serial/fsl_lpuart.c
> @@ -328,7 +328,7 @@ static void lpuart_dma_tx(struct lpuart_port *sport)
>  
>  	sport->dma_tx_bytes = uart_circ_chars_pending(xmit);
>  
> -	if (xmit->tail < xmit->head) {
> +	if (xmit->tail < xmit->head || xmit->head == 0) {
>  		sport->dma_tx_nents = 1;
>  		sg_init_one(sgl, xmit->buf + xmit->tail, sport->dma_tx_bytes);
>  	} else {
> @@ -359,7 +359,6 @@ static void lpuart_dma_tx(struct lpuart_port *sport)
>  	sport->dma_tx_in_progress = true;
>  	sport->dma_tx_cookie = dmaengine_submit(sport->dma_tx_desc);
>  	dma_async_issue_pending(sport->dma_tx_chan);
> -
>  }
>  
>  static void lpuart_dma_tx_complete(void *arg)