Skip to content

Commit 36f597b

Browse files
author
Bartosz Golaszewski
committed
gpiolib: fix lookup table matching
If on any iteration in gpiod_find(), gpio_desc_table_match() returns NULL (which is normal and expected), we never reinitialize desc back to ERR_PTR(-ENOENT) and if we don't find a match later on, we will return NULL causing a NULL-pointer dereference in users not expecting it. Don't initialize desc, but return ERR_PTR(-ENOENT) explicitly at the end of the function. Fixes: 9700b0f ("gpiolib: allow multiple lookup tables per consumer") Reported-by: Marek Szyprowski <m.szyprowski@samsung.com> Closes: https://lore.kernel.org/all/00107523-7737-4b92-a785-14ce4e93b8cb@samsung.com/ Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> Link: https://lore.kernel.org/r/20260108102314.18816-1-bartosz.golaszewski@oss.qualcomm.com Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
1 parent a802080 commit 36f597b

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

drivers/gpio/gpiolib.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4602,8 +4602,8 @@ static struct gpio_desc *gpio_desc_table_match(struct device *dev, const char *c
46024602
static struct gpio_desc *gpiod_find(struct device *dev, const char *con_id,
46034603
unsigned int idx, unsigned long *flags)
46044604
{
4605-
struct gpio_desc *desc = ERR_PTR(-ENOENT);
46064605
struct gpiod_lookup_table *table;
4606+
struct gpio_desc *desc;
46074607

46084608
guard(mutex)(&gpio_lookup_lock);
46094609

@@ -4619,7 +4619,7 @@ static struct gpio_desc *gpiod_find(struct device *dev, const char *con_id,
46194619
return desc;
46204620
}
46214621

4622-
return desc;
4622+
return ERR_PTR(-ENOENT);
46234623
}
46244624

46254625
static int platform_gpio_count(struct device *dev, const char *con_id)

0 commit comments

Comments
 (0)