]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
serial: sirf: Fix out-of-bounds access through DT alias
authorGeert Uytterhoeven <geert+renesas@glider.be>
Fri, 23 Feb 2018 13:38:36 +0000 (14:38 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Feb 2018 14:30:00 +0000 (15:30 +0100)
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: a6ffe8966acbb66b ("serial: sirf: use dynamic method allocate uart structure")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/sirfsoc_uart.c

index 9925b00a97772a1ba156f8fb1417652265d90525..38622f2a30a92e7d028dd618628a762e072e3699 100644 (file)
@@ -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 >= ARRAY_SIZE(sirf_ports)) {
+               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;