Commit 306ba240 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'gpio-fixes-for-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux 

Pull gpio fixes from Bartosz Golaszewski:

 - fix a memory leak in gpiolib core

 - fix reference leaks in gpio-amd8111 and gpio-rockchip

* tag 'gpio-fixes-for-v6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpio/rockchip: fix refcount leak in rockchip_gpiolib_register()
  gpio: amd8111: Fix PCI device reference count leak
  gpiolib: fix memory leak in gpiochip_setup_dev()
parents 57fb3f66 63ff545a

drivers/gpio/gpio-amd8111.c

+4 −0
Original line number Diff line number Diff line
@@ -226,7 +226,10 @@ static int __init amd_gpio_init(void) 
		ioport_unmap(gp.pm);

		goto out;

	}

	return 0;



out:

	pci_dev_put(pdev);

	return err;

}
@@ -234,6 +237,7 @@ static void __exit amd_gpio_exit(void) 
{

	gpiochip_remove(&gp.chip);

	ioport_unmap(gp.pm);

	pci_dev_put(gp.pdev);

}



module_init(amd_gpio_init);

drivers/gpio/gpio-rockchip.c

+1 −0
Original line number Diff line number Diff line
@@ -610,6 +610,7 @@ static int rockchip_gpiolib_register(struct rockchip_pin_bank *bank) 
			return -ENODATA;



		pctldev = of_pinctrl_get(pctlnp);

		of_node_put(pctlnp);

		if (!pctldev)

			return -ENODEV;

drivers/gpio/gpiolib.c

+26 −16
Original line number Diff line number Diff line
@@ -526,12 +526,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");
@@ -597,10 +598,10 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 
	struct fwnode_handle *fwnode = NULL;

	struct gpio_device *gdev;

	unsigned long flags;

	int base = gc->base;

	unsigned int i;

	u32 ngpios = 0;

	int base = 0;

	int ret = 0;

	u32 ngpios;



	if (gc->fwnode)

		fwnode = gc->fwnode;
@@ -647,17 +648,12 @@ 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;

	}



	/*

	 * Try the device properties if the driver didn't supply the number

	 * of GPIO lines.

	 */

	if (gc->ngpio == 0) {

	ngpios = gc->ngpio;

	if (ngpios == 0) {

		ret = device_property_read_u32(&gdev->dev, "ngpios", &ngpios);

		if (ret == -ENODATA)

			/*
@@ -668,7 +664,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 
			 */

			ngpios = 0;

		else if (ret)

			goto err_free_descs;

			goto err_free_dev_name;



		gc->ngpio = ngpios;

	}
@@ -676,13 +672,19 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data, 
	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;
@@ -701,11 +703,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;

		}

		/*
@@ -816,6 +820,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);
@@ -829,13 +838,14 @@ 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... */

	if (ret != -EPROBE_DEFER) {

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

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

		       base, base + (int)ngpios - 1,

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

	}

	kfree(gdev);

	return ret;

}

EXPORT_SYMBOL_GPL(gpiochip_add_data_with_key);