Commit e7d75e18 authored Feb 23, 2018 by Geert Uytterhoeven Committed by Greg Kroah-Hartman Feb 28, 2018

serial: xuartps: Fix out-of-bounds access through DT alias



The cdns_uart_port[] array is indexed using a value derived from the
"serialN" alias in DT, which may lead to an out-of-bounds access.

Fix this by adding a range check.

Fixes: 928e9263 ("tty: xuartps: Initialize ports according to aliases")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Michal Simek <michal.simek@xilinx.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 96c611c2

drivers/tty/serial/xilinx_uartps.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1110,7 +1110,7 @@ static struct uart_port *cdns_uart_get_port(int id)
		struct uart_port *port;

		/* Try the given port id if failed use default method */
		if (cdns_uart_port[id].mapbase != 0) {
		if (id < CDNS_UART_NR_PORTS && cdns_uart_port[id].mapbase != 0) {
		/* Find the next unused port */
		for (id = 0; id < CDNS_UART_NR_PORTS; id++)
		if (cdns_uart_port[id].mapbase == 0)