Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752019AbdGRPGK (ORCPT ); Tue, 18 Jul 2017 11:06:10 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:34247 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751932AbdGRPGG (ORCPT ); Tue, 18 Jul 2017 11:06:06 -0400 MIME-Version: 1.0 In-Reply-To: <1500377531-28358-1-git-send-email-khoroshilov@ispras.ru> References: <032e9a8b-8013-fe60-4a49-11cbf5cc28ed@ispras.ru> <1500377531-28358-1-git-send-email-khoroshilov@ispras.ru> From: Andy Shevchenko Date: Tue, 18 Jul 2017 18:06:04 +0300 Message-ID: Subject: Re: [PATCH v2] serial: 8250: fix error handling in of_platform_serial_probe() To: Alexey Khoroshilov Cc: Greg Kroah-Hartman , Jiri Slaby , Arnd Bergmann , "linux-serial@vger.kernel.org" , "linux-kernel@vger.kernel.org" , ldv-project@linuxtesting.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3382 Lines: 103 On Tue, Jul 18, 2017 at 2:32 PM, Alexey Khoroshilov wrote: > 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). > Reviewed-by: Andy Shevchenko (I esp. like the part of new label namings) > Signed-off-by: Alexey Khoroshilov > --- > v2: Rebase on top of e2860e1f62f2 "serial: 8250_of: Add reset support" > > drivers/tty/serial/8250/8250_of.c | 23 ++++++++++++++--------- > 1 file changed, 14 insertions(+), 9 deletions(-) > > diff --git a/drivers/tty/serial/8250/8250_of.c b/drivers/tty/serial/8250/8250_of.c > index 0cf95fd..539f1a6 100644 > --- a/drivers/tty/serial/8250/8250_of.c > +++ b/drivers/tty/serial/8250/8250_of.c > @@ -88,7 +88,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); > @@ -130,16 +130,16 @@ 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; > } > } > > info->rst = devm_reset_control_get_optional_shared(&ofdev->dev, NULL); > if (IS_ERR(info->rst)) > - goto out; > + goto err_dispose; > ret = reset_control_deassert(info->rst); > if (ret) > - goto out; > + goto err_dispose; > > port->type = type; > port->uartclk = clk; > @@ -167,7 +167,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; > @@ -201,7 +203,7 @@ static int of_platform_serial_probe(struct platform_device *ofdev) > memset(&port8250, 0, sizeof(port8250)); > ret = of_platform_serial_setup(ofdev, port_type, &port8250.port, info); > if (ret) > - goto out; > + goto err_setup; > > if (port8250.port.fifosize) > port8250.capabilities = UART_CAP_FIFO; > @@ -217,15 +219,18 @@ static int of_platform_serial_probe(struct platform_device *ofdev) > > ret = serial8250_register_8250_port(&port8250); > if (ret < 0) > - goto out; > + goto err_register; > > info->type = port_type; > info->line = ret; > platform_set_drvdata(ofdev, info); > return 0; > -out: > - kfree(info); > +err_register: > irq_dispose_mapping(port8250.port.irq); > + if (info->clk) > + clk_disable_unprepare(info->clk); > +err_setup: > + kfree(info); > return ret; > } > > -- > 2.7.4 > -- With Best Regards, Andy Shevchenko