From: Geert Uytterhoeven Date: Fri, 23 Feb 2018 13:38:32 +0000 (+0100) Subject: serial: mxs-auart: Fix out-of-bounds access through serial port index X-Git-Tag: v4.17-rc1~125^2~43 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=dd345a31bfdec350d2593e6de5964e55c7f19c76;p=uclinux-h8%2Flinux.git 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: 1ea6607d4cdc9179 ("serial: mxs-auart: Allow device tree probing") Signed-off-by: Geert Uytterhoeven Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index 079dc47aa142..caa8a41b6e71 100644 --- a/drivers/tty/serial/mxs-auart.c +++ b/drivers/tty/serial/mxs-auart.c @@ -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;