Unverified Commit e0ee97e5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12935 gpiolib: fix memory leak in gpiochip_setup_dev() 

Merge Pull Request from: @ci-robot 
 
PR sync from: He Yujie <coka.heyujie@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/54CHSFLT7K2HO3PZN3IQG7JXCYF5QDEZ/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAYRIL 
 
Link:https://gitee.com/openeuler/kernel/pulls/12935

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 8b3738f7 eef0684e

drivers/gpio/gpiolib.c

+22 −13
Original line number Diff line number Diff line
@@ -501,12 +501,13 @@ static int gpiochip_setup_dev(struct gpio_device *gdev) 
	if (ret)

		return ret;



	/* From this point, the .release() function cleans up gpio_device */

	gdev->dev.release = gpiodevice_release;



	ret = gpiochip_sysfs_register(gdev);

	if (ret)

		goto err_remove_device;



	/* From this point, the .release() function cleans up gpio_device */

	gdev->dev.release = gpiodevice_release;

	dev_dbg(&gdev->dev, "registered GPIOs %d to %d on %s\n", gdev->base,

		gdev->base + gdev->ngpio - 1, gdev->chip->label ? : "generic");
@@ -573,7 +574,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 
	unsigned long	flags;

	int		ret = 0;

	unsigned	i;

	int		base = gc->base;

	int		base = 0;

	struct gpio_device *gdev;



	/*
@@ -625,22 +626,22 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 
	else

		gdev->owner = THIS_MODULE;



	gdev->descs = kcalloc(gc->ngpio, sizeof(gdev->descs[0]), GFP_KERNEL);

	if (!gdev->descs) {

		ret = -ENOMEM;

		goto err_free_dev_name;

	}



	if (gc->ngpio == 0) {

		chip_err(gc, "tried to insert a GPIO chip with zero lines\n");

		ret = -EINVAL;

		goto err_free_descs;

		goto err_free_dev_name;

	}



	if (gc->ngpio > FASTPATH_NGPIO)

		chip_warn(gc, "line cnt %u is greater than fast path cnt %u\n",

			  gc->ngpio, FASTPATH_NGPIO);



	gdev->descs = kcalloc(gc->ngpio, sizeof(*gdev->descs), GFP_KERNEL);

	if (!gdev->descs) {

		ret = -ENOMEM;

		goto err_free_dev_name;

	}



	gdev->label = kstrdup_const(gc->label ?: "unknown", GFP_KERNEL);

	if (!gdev->label) {

		ret = -ENOMEM;
@@ -659,11 +660,13 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 
	 * it may be a pipe dream. It will not happen before we get rid

	 * of the sysfs interface anyways.

	 */

	base = gc->base;

	if (base < 0) {

		base = gpiochip_find_base(gc->ngpio);

		if (base < 0) {

			ret = base;

			spin_unlock_irqrestore(&gpio_lock, flags);

			ret = base;

			base = 0;

			goto err_free_label;

		}

		/*
@@ -771,6 +774,11 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 
err_free_gpiochip_mask:

	gpiochip_remove_pin_ranges(gc);

	gpiochip_free_valid_mask(gc);

	if (gdev->dev.release) {

		/* release() has been registered by gpiochip_setup_dev() */

		put_device(&gdev->dev);

		goto err_print_message;

	}

err_remove_from_list:

	spin_lock_irqsave(&gpio_lock, flags);

	list_del(&gdev->list);
@@ -784,11 +792,12 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 
err_free_ida:

	ida_free(&gpio_ida, gdev->id);

err_free_gdev:

	kfree(gdev);

err_print_message:

	/* failures here can mean systems won't boot... */

	pr_err("%s: GPIOs %d..%d (%s) failed to register, %d\n", __func__,

	       gdev->base, gdev->base + gdev->ngpio - 1,

	       base, base + gdev->ngpio - 1,

	       gc->label ? : "generic", ret);

	kfree(gdev);

	return ret;

}

EXPORT_SYMBOL_GPL(gpiochip_add_data_with_key);