Commit afc7851f authored Feb 23, 2018 by Geert Uytterhoeven Committed by Greg Kroah-Hartman Feb 28, 2018

serial: pxa: Fix out-of-bounds access through serial port index



The serial_pxa_ports[] array is indexed using a value derived from the
"serialN" alias in DT, or from platform data, which may lead to an
out-of-bounds access.

Fix this by adding a range check.

Fixes: 699c20f3 ("serial: pxa: add OF support")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent dd345a31

drivers/tty/serial/pxa.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -885,6 +885,10 @@ static int serial_pxa_probe(struct platform_device *dev)
		sport->port.line = dev->id;
		else if (ret < 0)
		goto err_clk;
		if (sport->port.line >= ARRAY_SIZE(serial_pxa_ports)) {
		dev_err(&dev->dev, "serial%d out of range\n", sport->port.line);
		return -EINVAL;
		}
		snprintf(sport->name, PXA_NAME_LEN - 1, "UART%d", sport->port.line + 1);

		sport->port.membase = ioremap(mmres->start, resource_size(mmres));

Admin message