Skip to contentSkip to conversation

gpiolib: fix freeing of descriptors on error

PATCH In review Jim Paris 3 participants 3 messages Sep 13, 2018 – Sep 14, 2018

Subsystems (2)
lore
Share & tools
lore

Jim Paris

author
#0 lore raw

PATCH 1/1 gpiolib: fix freeing of descriptors on error

When the main loop in linehandle_create() encounters an error, it fails to free one of the previously-requested GPIO descriptors. This renders the unfreed GPIO unusable until reboot, and leaves its label pointing to free'd kernel memory.

Fixes ab3dbcf78f60 ("gpioib: do not free unrequested descriptors")
---
 drivers/gpio/gpiolib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpiolib.c +1 -1
index e8f8a1999393..a57300c1d649 100644
@@ -571,7 +571,7 @@ static int linehandle_create(struct gpio_device *gdev, void __user *ip)
 		if (ret)
 			goto out_free_descs;
 		lh->descs[i] = desc;
-		count = i;
+		count = i + 1;
 
 		if (lflags & GPIOHANDLE_REQUEST_ACTIVE_LOW)
 			set_bit(FLAG_ACTIVE_LOW, &desc->flags);
Signature · 1 line
2.18.0
#1 lore raw

Hi Jim

I have sent an identical patch 3 hours before you [1] ;) Seems that we are working on the same stuff.

Cheers

[1] https://www.spinics.net/lists/linux-gpio/msg32541.html

Quoted 29 lines · Jim Paris

When the main loop in linehandle_create() encounters an error, it fails to free one of the previously-requested GPIO descriptors. This renders the unfreed GPIO unusable until reboot, and leaves its label pointing to free'd kernel memory.

Fixes ab3dbcf78f60 ("gpioib: do not free unrequested descriptors")
---
 drivers/gpio/gpiolib.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpiolib.c +1 -2
index e8f8a1999393..a57300c1d649 100644
@@ -571,7 +571,7 @@ static int linehandle_create(struct gpio_device *gdev, void __user *ip)
                if (ret)
                        goto out_free_descs;
                lh->descs[i] = desc;
-               count = i;
+               count = i + 1;
 
                if (lflags & GPIOHANDLE_REQUEST_ACTIVE_LOW)
                        set_bit(FLAG_ACTIVE_LOW, &desc->flags);
--

2.18.0

Signature · 1 line
Ricardo Ribalda
#2 lore raw
Quoted 4 lines · Ricardo Ribalda Delgado

Hi Jim

I have sent an identical patch 3 hours before you [1] ;) Seems that we are working on the same stuff.

Haha w00t but I'm grateful that you fine people are taking the chardev ABI for a ride!

I recorded Jim's contribution as Reported-by on your patch.

Yours,
Linus Walleij