diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2018-02-23 16:38:33 +0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-10-21 10:44:51 +0300 |
| commit | e5fa16d811f7af915604e30a358a285d469f2de9 (patch) | |
| tree | 4a8415970e4461ff8dca53aa7dc1481f98cfd08b /drivers/tty | |
| parent | 0130e9ac95bd5bad7dbcd9f938fbe49c97357621 (diff) | |
| download | linux-e5fa16d811f7af915604e30a358a285d469f2de9.tar.xz | |
serial: pxa: Fix out-of-bounds access through serial port index
commit afc7851fab8329eddcf321c9e0a58c893f351dd6 upstream.
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: 699c20f3e6310aa2 ("serial: pxa: add OF support")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/pxa.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c index c638c53cd2b6..94c6994e4060 100644 --- a/drivers/tty/serial/pxa.c +++ b/drivers/tty/serial/pxa.c @@ -888,6 +888,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)); |