]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
serial: sh-sci: Check that the DMA cookie is valid
authorClaudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Wed, 17 Dec 2025 13:57:59 +0000 (15:57 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 2 Jan 2026 11:57:15 +0000 (12:57 +0100)
commit c3ca8a0aac832fe8047608bb2ae2cca314c6d717 upstream.

The driver updates struct sci_port::tx_cookie to zero right before the TX
work is scheduled, or to -EINVAL when DMA is disabled.
dma_async_is_complete(), called through dma_cookie_status() (and possibly
through dmaengine_tx_status()), considers cookies valid only if they have
values greater than or equal to 1.

Passing zero or -EINVAL to dmaengine_tx_status() before any TX DMA
transfer has started leads to an incorrect TX status being reported, as the
cookie is invalid for the DMA subsystem. This may cause long wait times
when the serial device is opened for configuration before any TX activity
has occurred.

Check that the TX cookie is valid before passing it to
dmaengine_tx_status().

Fixes: 7cc0e0a43a91 ("serial: sh-sci: Check if TX data was written to device in .tx_empty()")
Cc: stable <stable@kernel.org>
Signed-off-by: Claudiu Beznea <claudiu.beznea.uj@bp.renesas.com>
Link: https://patch.msgid.link/20251217135759.402015-1-claudiu.beznea.uj@bp.renesas.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/sh-sci.c

index 1db4af6fe59096de9d8902643e544230b9bdd56f..d91b1fb69bebdfaf3dad99bc0b1de8c787d54cb2 100644 (file)
@@ -1740,7 +1740,7 @@ static void sci_dma_check_tx_occurred(struct sci_port *s)
        struct dma_tx_state state;
        enum dma_status status;
 
-       if (!s->chan_tx)
+       if (!s->chan_tx || s->cookie_tx <= 0)
                return;
 
        status = dmaengine_tx_status(s->chan_tx, s->cookie_tx, &state);