serial: 8250: fix error handling in of_platform_serial_probe()

commit fa9ba3acb557e444fe4a736ab654f0d0a0fbccde upstream.

clk_disable_unprepare(info->clk) is missed in of_platform_serial_probe(),
while irq_dispose_mapping(port->irq) is missed in of_platform_serial_setup().

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[sudip: adjust context]
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c
index f89dfde934a3257ca9834342bb4fc806ae69e8c9..8440c92ff20c54a267222eadf0aa4b5b3d65c28f 100644 (file)
--- a/drivers/tty/serial/8250/8250_of.c
+++ b/drivers/tty/serial/8250/8250_of.c
@@ -86,7 +86,7 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
        ret = of_address_to_resource(np, 0, &resource);
        if (ret) {
                dev_warn(&ofdev->dev, "invalid address\n");
-               goto out;
+               goto err_unprepare;
        }
 
        spin_lock_init(&port->lock);
@@ -132,7 +132,7 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
                        dev_warn(&ofdev->dev, "unsupported reg-io-width (%d)\n",
                                 prop);
                        ret = -EINVAL;
-                       goto out;
+                       goto err_dispose;
                }
        }
 
@@ -162,7 +162,9 @@ static int of_platform_serial_setup(struct platform_device *ofdev,
                port->handle_irq = fsl8250_handle_irq;
 
        return 0;
-out:
+err_dispose:
+       irq_dispose_mapping(port->irq);
+err_unprepare:
        if (info->clk)
                clk_disable_unprepare(info->clk);
        return ret;
@@ -194,7 +196,7 @@ static int of_platform_serial_probe(struct platform_device *ofdev)
        port_type = (unsigned long)match->data;
        ret = of_platform_serial_setup(ofdev, port_type, &port, info);
        if (ret)
-               goto out;
+               goto err_free;
 
        switch (port_type) {
        case PORT_8250 ... PORT_MAX_8250:
@@ -228,15 +230,18 @@ static int of_platform_serial_probe(struct platform_device *ofdev)
                break;
        }
        if (ret < 0)
-               goto out;
+               goto err_dispose;
 
        info->type = port_type;
        info->line = ret;
        platform_set_drvdata(ofdev, info);
        return 0;
-out:
-       kfree(info);
+err_dispose:
        irq_dispose_mapping(port.irq);
+       if (info->clk)
+               clk_disable_unprepare(info->clk);
+err_free:
+       kfree(info);
        return ret;
 }