lkml.org 
[lkml]   [2021]   [Nov]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 3/3] serial: liteuart: fix minor-number leak on probe errors
    On Mon, Nov 15, 2021 at 02:37:45PM +0100, Johan Hovold wrote:
    > Make sure to release the allocated minor number before returning on
    > probe errors.
    >
    > Fixes: 1da81e5562fa ("drivers/tty/serial: add LiteUART driver")
    > Cc: stable@vger.kernel.org # 5.11
    > Cc: Filip Kokosinski <fkokosinski@antmicro.com>
    > Cc: Mateusz Holenko <mholenko@antmicro.com>
    > Cc: Stafford Horne <shorne@gmail.com>
    > Signed-off-by: Johan Hovold <johan@kernel.org>

    Reviewed-by: Stafford Horne <shorne@gmail.com>

    > ---
    > drivers/tty/serial/liteuart.c | 17 ++++++++++++++---
    > 1 file changed, 14 insertions(+), 3 deletions(-)
    >
    > diff --git a/drivers/tty/serial/liteuart.c b/drivers/tty/serial/liteuart.c
    > index da792d0df790..2941659e5274 100644
    > --- a/drivers/tty/serial/liteuart.c
    > +++ b/drivers/tty/serial/liteuart.c
    > @@ -270,8 +270,10 @@ static int liteuart_probe(struct platform_device *pdev)
    >
    > /* get membase */
    > port->membase = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
    > - if (IS_ERR(port->membase))
    > - return PTR_ERR(port->membase);
    > + if (IS_ERR(port->membase)) {
    > + ret = PTR_ERR(port->membase);
    > + goto err_erase_id;
    > + }
    >
    > /* values not from device tree */
    > port->dev = &pdev->dev;
    > @@ -287,7 +289,16 @@ static int liteuart_probe(struct platform_device *pdev)
    >
    > platform_set_drvdata(pdev, port);
    >
    > - return uart_add_one_port(&liteuart_driver, &uart->port);
    > + ret = uart_add_one_port(&liteuart_driver, &uart->port);
    > + if (ret)
    > + goto err_erase_id;
    > +
    > + return 0;
    > +
    > +err_erase_id:
    > + xa_erase(&liteuart_array, uart->id);
    > +
    > + return ret;
    > }
    >
    > static int liteuart_remove(struct platform_device *pdev)
    > --
    > 2.32.0
    >

    \
     
     \ /
      Last update: 2021-11-16 01:13    [W:2.399 / U:0.292 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site