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

torvalds · torvalds · commit 4b89ca5a780f · 2023-02-17T13:58:20.000-08:00
Pull gpio fix from Bartosz Golaszewski:

 - fix a memory leak in gpio-sim that was triggered every time libgpiod
   tests are run in user-space

* tag 'gpio-fixes-for-v6.2-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux:
  gpio: sim: fix a memory leak
diff --git a/drivers/gpio/gpio-sim.c b/drivers/gpio/gpio-sim.c
@@ -736,7 +736,7 @@ static void gpio_sim_remove_hogs(struct gpio_sim_device *dev)
 
 	gpiod_remove_hogs(dev->hogs);
 
-	for (hog = dev->hogs; !hog->chip_label; hog++) {
+	for (hog = dev->hogs; hog->chip_label; hog++) {
 		kfree(hog->chip_label);
 		kfree(hog->line_name);
 	}

Original file line number	Diff line number	Diff line change
`@@ -736,7 +736,7 @@ static void gpio_sim_remove_hogs(struct gpio_sim_device *dev)`
`736`	`736`
`737`	`737`	`gpiod_remove_hogs(dev->hogs);`
`738`	`738`
`739`		`- for (hog = dev->hogs; !hog->chip_label; hog++) {`
	`739`	`+ for (hog = dev->hogs; hog->chip_label; hog++) {`
`740`	`740`	`kfree(hog->chip_label);`
`741`	`741`	`kfree(hog->line_name);`
`742`	`742`	`}`