| From: Geert Uytterhoeven <geert+renesas@glider.be> |
| Date: Fri, 23 Feb 2018 14:38:33 +0100 |
| Subject: 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> |
| --- |
| drivers/tty/serial/pxa.c | 4 ++++ |
| 1 file changed, 4 insertions(+) |
| |
| --- a/drivers/tty/serial/pxa.c |
| +++ b/drivers/tty/serial/pxa.c |
| @@ -888,6 +888,10 @@ static int serial_pxa_probe(struct platf |
| 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)); |