Commit 4cb84bd8 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman

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

[ Upstream commit e7d75e18 ]

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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarMichal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7c360637
...@@ -1106,7 +1106,7 @@ static struct uart_port *cdns_uart_get_port(int id) ...@@ -1106,7 +1106,7 @@ static struct uart_port *cdns_uart_get_port(int id)
struct uart_port *port; struct uart_port *port;
/* Try the given port id if failed use default method */ /* 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 */ /* Find the next unused port */
for (id = 0; id < CDNS_UART_NR_PORTS; id++) for (id = 0; id < CDNS_UART_NR_PORTS; id++)
if (cdns_uart_port[id].mapbase == 0) if (cdns_uart_port[id].mapbase == 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment