]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
serial: pxa: Fix an error handling path in 'serial_pxa_probe()'
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Mon, 11 Jun 2018 17:30:35 +0000 (19:30 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Jun 2018 12:07:54 +0000 (21:07 +0900)
If port.line is out of range, we still need to release some resources, or
we will leak them.

Fixes: afc7851fab83 ("serial: pxa: Fix out-of-bounds access through serial port index")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/pxa.c

index eda3c7710d6a745f4c7a1f957d38e8b8e2104e59..4932b674f7efa9535421eedd6e929262b42c7cec 100644 (file)
@@ -887,7 +887,8 @@ static int serial_pxa_probe(struct platform_device *dev)
                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;
+               ret = -EINVAL;
+               goto err_clk;
        }
        snprintf(sport->name, PXA_NAME_LEN - 1, "UART%d", sport->port.line + 1);