Commit 96c611c2 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Greg Kroah-Hartman

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

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: a6ffe896 ("serial: sirf: use dynamic method allocate uart structure")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 090fa4b0
...@@ -1283,6 +1283,11 @@ static int sirfsoc_uart_probe(struct platform_device *pdev) ...@@ -1283,6 +1283,11 @@ static int sirfsoc_uart_probe(struct platform_device *pdev)
goto err; goto err;
} }
sirfport->port.line = of_alias_get_id(np, "serial"); 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; sirf_ports[sirfport->port.line] = sirfport;
sirfport->port.iotype = UPIO_MEM; sirfport->port.iotype = UPIO_MEM;
sirfport->port.flags = UPF_BOOT_AUTOCONF; sirfport->port.flags = UPF_BOOT_AUTOCONF;
......
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