lkml.org 
[lkml]   [2022]   [Feb]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 097/139] iio: adc: men_z188_adc: Fix a resource leak in an error handling path
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    commit e0a2e37f303828d030a83f33ffe14b36cb88d563 upstream.

    If iio_device_register() fails, a previous ioremap() is left unbalanced.

    Update the error handling path and add the missing iounmap() call, as
    already done in the remove function.

    Fixes: 74aeac4da66f ("iio: adc: Add MEN 16z188 ADC driver")
    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Link: https://lore.kernel.org/r/320fc777863880247c2aff4a9d1a54ba69abf080.1643445149.git.christophe.jaillet@wanadoo.fr
    Cc: <Stable@vger.kernel.org>
    Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/iio/adc/men_z188_adc.c | 9 ++++++++-
    1 file changed, 8 insertions(+), 1 deletion(-)

    --- a/drivers/iio/adc/men_z188_adc.c
    +++ b/drivers/iio/adc/men_z188_adc.c
    @@ -103,6 +103,7 @@ static int men_z188_probe(struct mcb_dev
    struct z188_adc *adc;
    struct iio_dev *indio_dev;
    struct resource *mem;
    + int ret;

    indio_dev = devm_iio_device_alloc(&dev->dev, sizeof(struct z188_adc));
    if (!indio_dev)
    @@ -128,8 +129,14 @@ static int men_z188_probe(struct mcb_dev
    adc->mem = mem;
    mcb_set_drvdata(dev, indio_dev);

    - return iio_device_register(indio_dev);
    + ret = iio_device_register(indio_dev);
    + if (ret)
    + goto err_unmap;

    + return 0;
    +
    +err_unmap:
    + iounmap(adc->base);
    err:
    mcb_release_mem(mem);
    return -ENXIO;

    \
     
     \ /
      Last update: 2022-02-28 19:00    [W:7.242 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site