| Message ID | 1519119624-1268-5-git-send-email-geert+renesas@glider.be |
|---|---|
| State | New |
| Headers | show |
| Series | serial: Fix out-of-bounds accesses through DT aliases | expand |
On Tue, Feb 20, 2018 at 10:40 AM, Geert Uytterhoeven <geert+renesas@glider.be> wrote: > The auart_port[] 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: cabf23e7aa00b145 ("serial: mxs-auart: Fix out-of-bounds access through DT alias") Fixes: 1ea6607d4cdc9179 ("serial: mxs-auart: Allow device tree probing") Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
diff --git a/drivers/tty/serial/mxs-auart.c b/drivers/tty/serial/mxs-auart.c index 079dc47aa142d8e1..7ec1298512facfc8 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 >= MXS_AUART_PORTS) { + dev_err(&pdev->dev, "serial%d out of range\n", s->port.line); + return -EINVAL; + } if (of_id) { pdev->id_entry = of_id->data;
The auart_port[] 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: cabf23e7aa00b145 ("serial: mxs-auart: Fix out-of-bounds access through DT alias") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/tty/serial/mxs-auart.c | 4 ++++ 1 file changed, 4 insertions(+)