serial: sh-sci: Fix out-of-bounds access through DT alias
authorGeert Uytterhoeven <geert+renesas@glider.be>
Fri, 23 Feb 2018 13:38:35 +0000 (14:38 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 28 Feb 2018 14:30:00 +0000 (15:30 +0100)
The sci_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.

Note that the array size is defined by a Kconfig symbol
(CONFIG_SERIAL_SH_SCI_NR_UARTS), so this can even be triggered using a
legitimate DTB.

Fixes: 97ed9790c514066b ("serial: sh-sci: Remove unused platform data capabilities field")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/sh-sci.c

index af1c3246cee14ea04bfe91545f5d63fda070a324..0ec2d938011d0ef1f551b684a42834e76c7e968c 100644 (file)
@@ -3109,6 +3109,10 @@ static struct plat_sci_port *sci_parse_dt(struct platform_device *pdev,
                dev_err(&pdev->dev, "failed to get alias id (%d)\n", id);
                return NULL;
        }
+       if (id >= ARRAY_SIZE(sci_ports)) {
+               dev_err(&pdev->dev, "serial%d out of range\n", id);
+               return NULL;
+       }
 
        sp = &sci_ports[id];
        *dev_id = id;