Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2e668d7f authored by Vladimir Zapolskiy's avatar Vladimir Zapolskiy Committed by Greg Kroah-Hartman
Browse files

gpio: don't free unallocated ida on gpiochip_add_data_with_key() error path 



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: ff2b1359 ("gpio: make the gpiochip a real device")
Cc: stable@vger.kernel.org # v4.6+
Signed-off-by: default avatarVladimir Zapolskiy <vz@mleia.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1b901939

drivers/gpio/gpiolib.c

+3 −2
Original line number Diff line number Diff line
@@ -1153,7 +1153,7 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data) 
	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 @@ int gpiochip_add_data(struct gpio_chip *chip, void *data) 
	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,