lkml.org 
[lkml]   [2018]   [Feb]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/9] serial: pxa: Fix out-of-bounds access through DT alias
    Date
    The serial_pxa_ports[] 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: c8dcdc77298dde67 ("serial: pxa: Fix out-of-bounds access through DT alias")
    Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
    ---
    drivers/tty/serial/pxa.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c
    index baf552944d5686e8..ac25faa95baaad0e 100644
    --- a/drivers/tty/serial/pxa.c
    +++ b/drivers/tty/serial/pxa.c
    @@ -885,6 +885,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));
    --
    2.7.4
    \
     
     \ /
      Last update: 2018-02-20 11:22    [W:4.222 / U:0.048 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site