Skip to content

Commit 7d3b793

Browse files
hvilleneuvedoogregkh
authored andcommitted
serial: sc16is7xx: fix invalid FIFO access with special register set
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: dfeae61 ("serial: sc16is7xx") Cc: [email protected] Signed-off-by: Hugo Villeneuve <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 133f4c0 commit 7d3b793

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/tty/serial/sc16is7xx.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -592,6 +592,8 @@ static int sc16is7xx_set_baud(struct uart_port *port, int baud)
592592
SC16IS7XX_MCR_CLKSEL_BIT,
593593
prescaler == 1 ? 0 : SC16IS7XX_MCR_CLKSEL_BIT);
594594

595+
mutex_lock(&one->efr_lock);
596+
595597
/* Backup LCR and access special register set (DLL/DLH) */
596598
lcr = sc16is7xx_port_read(port, SC16IS7XX_LCR_REG);
597599
sc16is7xx_port_write(port, SC16IS7XX_LCR_REG,
@@ -606,6 +608,8 @@ static int sc16is7xx_set_baud(struct uart_port *port, int baud)
606608
/* Restore LCR and access to general register set */
607609
sc16is7xx_port_write(port, SC16IS7XX_LCR_REG, lcr);
608610

611+
mutex_unlock(&one->efr_lock);
612+
609613
return DIV_ROUND_CLOSEST((clk / prescaler) / 16, div);
610614
}
611615

0 commit comments

Comments
 (0)