| Message ID | 1519119624-1268-9-git-send-email-geert+renesas@glider.be |
|---|---|
| State | New |
| Headers | show |
| Series | serial: Fix out-of-bounds accesses through DT aliases | expand |
On Tue, Feb 20, 2018 at 10:40 AM, Geert Uytterhoeven <geert+renesas@glider.be> wrote: > The sirf_ports[] 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: 66c7ab1120585d18 ("serial: sirf: Fix out-of-bounds access through DT alias") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Fixes: a6ffe8966acbb66b ("serial: sirf: use dynamic method allocate uart structure") Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c index 9925b00a97772a1b..701df3319ff7579d 100644 --- a/drivers/tty/serial/sirfsoc_uart.c +++ b/drivers/tty/serial/sirfsoc_uart.c @@ -1283,6 +1283,11 @@ static int sirfsoc_uart_probe(struct platform_device *pdev) goto err; } sirfport->port.line = of_alias_get_id(np, "serial"); + if (sirfport->port.line >= SIRFSOC_UART_NR) { + dev_err(&pdev->dev, "serial%d out of range\n", + sirfport->port.line); + return -EINVAL; + } sirf_ports[sirfport->port.line] = sirfport; sirfport->port.iotype = UPIO_MEM; sirfport->port.flags = UPF_BOOT_AUTOCONF;
The sirf_ports[] 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: 66c7ab1120585d18 ("serial: sirf: Fix out-of-bounds access through DT alias") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/tty/serial/sirfsoc_uart.c | 5 +++++ 1 file changed, 5 insertions(+)