Commit 2e69af16 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull gpio fixes from Bartosz Golaszewski:

 - make sure GPIO devices are registered with the subsystem before
   trying to return them to a caller of gpio_device_find()

 - fix two issues with incorrect sanitization of the interrupt labels

* tag 'gpio-fixes-for-v6.9-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpio: cdev: fix missed label sanitizing in debounce_setup()
  gpio: cdev: check for NULL labels when sanitizing them for irqs
  gpiolib: Fix triggering "kobject: 'gpiochipX' is not initialized, yet" kobject_get() errors
parents 4c3fc345 83092341

drivers/gpio/gpiolib-cdev.c

+32 −16
Original line number Diff line number Diff line
@@ -728,6 +728,25 @@ static u32 line_event_id(int level) 
		       GPIO_V2_LINE_EVENT_FALLING_EDGE;

}



static inline char *make_irq_label(const char *orig)

{

	char *new;



	if (!orig)

		return NULL;



	new = kstrdup_and_replace(orig, '/', ':', GFP_KERNEL);

	if (!new)

		return ERR_PTR(-ENOMEM);



	return new;

}



static inline void free_irq_label(const char *label)

{

	kfree(label);

}



#ifdef CONFIG_HTE



static enum hte_return process_hw_ts_thread(void *p)
@@ -1015,6 +1034,7 @@ static int debounce_setup(struct line *line, unsigned int debounce_period_us) 
{

	unsigned long irqflags;

	int ret, level, irq;

	char *label;



	/* try hardware */

	ret = gpiod_set_debounce(line->desc, debounce_period_us);
@@ -1037,11 +1057,17 @@ static int debounce_setup(struct line *line, unsigned int debounce_period_us) 
			if (irq < 0)

				return -ENXIO;



			label = make_irq_label(line->req->label);

			if (IS_ERR(label))

				return -ENOMEM;



			irqflags = IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING;

			ret = request_irq(irq, debounce_irq_handler, irqflags,

					  line->req->label, line);

			if (ret)

					  label, line);

			if (ret) {

				free_irq_label(label);

				return ret;

			}

			line->irq = irq;

		} else {

			ret = hte_edge_setup(line, GPIO_V2_LINE_FLAG_EDGE_BOTH);
@@ -1083,16 +1109,6 @@ static u32 gpio_v2_line_config_debounce_period(struct gpio_v2_line_config *lc, 
	return 0;

}



static inline char *make_irq_label(const char *orig)

{

	return kstrdup_and_replace(orig, '/', ':', GFP_KERNEL);

}



static inline void free_irq_label(const char *label)

{

	kfree(label);

}



static void edge_detector_stop(struct line *line)

{

	if (line->irq) {
@@ -1158,8 +1174,8 @@ static int edge_detector_setup(struct line *line, 
	irqflags |= IRQF_ONESHOT;



	label = make_irq_label(line->req->label);

	if (!label)

		return -ENOMEM;

	if (IS_ERR(label))

		return PTR_ERR(label);



	/* Request a thread to read the events */

	ret = request_threaded_irq(irq, edge_irq_handler, edge_irq_thread,
@@ -2217,8 +2233,8 @@ static int lineevent_create(struct gpio_device *gdev, void __user *ip) 
		goto out_free_le;



	label = make_irq_label(le->label);

	if (!label) {

		ret = -ENOMEM;

	if (IS_ERR(label)) {

		ret = PTR_ERR(label);

		goto out_free_le;

	}

drivers/gpio/gpiolib.c

+3 −0
Original line number Diff line number Diff line
@@ -1175,6 +1175,9 @@ struct gpio_device *gpio_device_find(const void *data, 


	list_for_each_entry_srcu(gdev, &gpio_devices, list,

				 srcu_read_lock_held(&gpio_devices_srcu)) {

		if (!device_is_registered(&gdev->dev))

			continue;



		guard(srcu)(&gdev->srcu);



		gc = srcu_dereference(gdev->chip, &gdev->srcu);