lkml.org 
[lkml]   [2018]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 05/92] gpio: dont free unallocated ida on gpiochip_add_data_with_key() error path
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Vladimir Zapolskiy <vz@mleia.com>

    commit a05a14049999598a3bb6fab12db6b768a0215522 upstream.

    The change corrects the error path in gpiochip_add_data_with_key()
    by avoiding to call ida_simple_remove(), if ida_simple_get() returns
    an error.

    Note that ida_simple_remove()/ida_free() throws a BUG(), if id argument
    is negative, it allows to easily check the correctness of the fix by
    fuzzing the return value from ida_simple_get().

    Fixes: ff2b13592299 ("gpio: make the gpiochip a real device")
    Cc: stable@vger.kernel.org # v4.6+
    Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpio/gpiolib.c | 5 +++--
    1 file changed, 3 insertions(+), 2 deletions(-)

    --- a/drivers/gpio/gpiolib.c
    +++ b/drivers/gpio/gpiolib.c
    @@ -1153,7 +1153,7 @@ int gpiochip_add_data(struct gpio_chip *
    gdev->descs = kcalloc(chip->ngpio, sizeof(gdev->descs[0]), GFP_KERNEL);
    if (!gdev->descs) {
    status = -ENOMEM;
    - goto err_free_gdev;
    + goto err_free_ida;
    }

    if (chip->ngpio == 0) {
    @@ -1285,8 +1285,9 @@ err_free_label:
    kfree(gdev->label);
    err_free_descs:
    kfree(gdev->descs);
    -err_free_gdev:
    +err_free_ida:
    ida_simple_remove(&gpio_ida, gdev->id);
    +err_free_gdev:
    /* failures here can mean systems won't boot... */
    pr_err("%s: GPIOs %d..%d (%s) failed to register\n", __func__,
    gdev->base, gdev->base + gdev->ngpio - 1,

    \
     
     \ /
      Last update: 2018-11-29 15:57    [W:4.427 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site