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

serial: mxs-auart: Fix out-of-bounds access through serial port index



The auart_port[] 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: 1ea6607d ("serial: mxs-auart: Allow device tree probing")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 56734448

drivers/tty/serial/mxs-auart.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -1663,6 +1663,10 @@ static int mxs_auart_probe(struct platform_device *pdev)
		s->port.line = pdev->id < 0 ? 0 : pdev->id;
		else if (ret < 0)
		return ret;
		if (s->port.line >= ARRAY_SIZE(auart_port)) {
		dev_err(&pdev->dev, "serial%d out of range\n", s->port.line);
		return -EINVAL;
		}

		if (of_id) {
		pdev->id_entry = of_id->data;