]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
serial: sc16is7xx: fix invalid FIFO access with special register set
authorHugo Villeneuve <hvilleneuve@dimonoff.com>
Tue, 23 Jul 2024 12:53:01 +0000 (08:53 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 31 Jul 2024 10:31:19 +0000 (12:31 +0200)
When enabling access to the special register set, Receiver time-out and
RHR interrupts can happen. In this case, the IRQ handler will try to read
from the FIFO thru the RHR register at address 0x00, but address 0x00 is
mapped to DLL register, resulting in erroneous FIFO reading.

Call graph example:
    sc16is7xx_startup(): entry
    sc16is7xx_ms_proc(): entry
    sc16is7xx_set_termios(): entry
    sc16is7xx_set_baud(): DLH/DLL = $009C --> access special register set
    sc16is7xx_port_irq() entry            --> IIR is 0x0C
    sc16is7xx_handle_rx() entry
    sc16is7xx_fifo_read(): --> unable to access FIFO (RHR) because it is
                               mapped to DLL (LCR=LCR_CONF_MODE_A)
    sc16is7xx_set_baud(): exit --> Restore access to general register set

Fix the problem by claiming the efr_lock mutex when accessing the Special
register set.

Fixes: dfeae619d781 ("serial: sc16is7xx")
Cc: stable@vger.kernel.org
Signed-off-by: Hugo Villeneuve <hvilleneuve@dimonoff.com>
Link: https://lore.kernel.org/r/20240723125302.1305372-3-hugo@hugovil.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/sc16is7xx.c

index 58696e05492ca687320b67dfe8e6ae4e644f7b2e..b4c1798a1df2a079b4a398b7f8d38d45d3264578 100644 (file)
@@ -592,6 +592,8 @@ static int sc16is7xx_set_baud(struct uart_port *port, int baud)
                              SC16IS7XX_MCR_CLKSEL_BIT,
                              prescaler == 1 ? 0 : SC16IS7XX_MCR_CLKSEL_BIT);
 
+       mutex_lock(&one->efr_lock);
+
        /* Backup LCR and access special register set (DLL/DLH) */
        lcr = sc16is7xx_port_read(port, SC16IS7XX_LCR_REG);
        sc16is7xx_port_write(port, SC16IS7XX_LCR_REG,
@@ -606,6 +608,8 @@ static int sc16is7xx_set_baud(struct uart_port *port, int baud)
        /* Restore LCR and access to general register set */
        sc16is7xx_port_write(port, SC16IS7XX_LCR_REG, lcr);
 
+       mutex_unlock(&one->efr_lock);
+
        return DIV_ROUND_CLOSEST((clk / prescaler) / 16, div);
 }