lkml.org 
[lkml]   [2020]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.6 097/177] gpio: exar: Fix bad handling for ida_simple_get error path
    Date
    From: Takashi Iwai <tiwai@suse.de>

    [ Upstream commit 333830aa149a87cabeb5d30fbcf12eecc8040d2c ]

    The commit 7ecced0934e5 ("gpio: exar: add a check for the return value
    of ida_simple_get fails") added a goto jump to the common error
    handler for ida_simple_get() error, but this is wrong in two ways:
    it doesn't set the proper return code and, more badly, it invokes
    ida_simple_remove() with a negative index that shall lead to a kernel
    panic via BUG_ON().

    This patch addresses those two issues.

    Fixes: 7ecced0934e5 ("gpio: exar: add a check for the return value of ida_simple_get fails")
    Cc: <stable@vger.kernel.org>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/gpio/gpio-exar.c | 7 +++++--
    1 file changed, 5 insertions(+), 2 deletions(-)

    diff --git a/drivers/gpio/gpio-exar.c b/drivers/gpio/gpio-exar.c
    index da1ef0b1c291..b1accfba017d 100644
    --- a/drivers/gpio/gpio-exar.c
    +++ b/drivers/gpio/gpio-exar.c
    @@ -148,8 +148,10 @@ static int gpio_exar_probe(struct platform_device *pdev)
    mutex_init(&exar_gpio->lock);

    index = ida_simple_get(&ida_index, 0, 0, GFP_KERNEL);
    - if (index < 0)
    - goto err_destroy;
    + if (index < 0) {
    + ret = index;
    + goto err_mutex_destroy;
    + }

    sprintf(exar_gpio->name, "exar_gpio%d", index);
    exar_gpio->gpio_chip.label = exar_gpio->name;
    @@ -176,6 +178,7 @@ static int gpio_exar_probe(struct platform_device *pdev)

    err_destroy:
    ida_simple_remove(&ida_index, index);
    +err_mutex_destroy:
    mutex_destroy(&exar_gpio->lock);
    return ret;
    }
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-01 20:16    [W:4.043 / U:1.996 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site