Skip to contentSkip to conversation

gpib: fix double decrement of descriptor_busy in command_ioctl()

PATCH New Adam Crosser 1 participant 1 message Apr 24 GPIB drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpib: fix double decrement of descriptor_busy in command_ioctl()

From: Adam Crosser <[email protected]>

commit d1857f8296dc ("gpib: fix use-after-free in IO ioctl handlers") introduced a descriptor_busy reference counter to pin struct gpib_descriptor across IO ioctl operations. In command_ioctl(), the error path inside the loop decrements descriptor_busy and breaks, but execution then falls through to the unconditional decrement after the loop, underflowing the counter to -1.

This re-enables the use-after-free that the original fix was meant to
prevent: a concurrent close_dev_ioctl() sees descriptor_busy == 0 on an actively-used descriptor and frees it.

Remove the early decrement from the error path. The post-loop decrement already handles all exit paths, matching the correct pattern used in read_ioctl() and write_ioctl().

Fixes d1857f8296dc ("gpib: fix use-after-free in IO ioctl handlers")
---
 drivers/gpib/common/gpib_os.c | 1 -
 1 file changed, 1 deletion(-)
drivers/gpib/common/gpib_os.c +0 -1
index 97c98f0..2b4ec6a 100644
@@ -1018,7 +1018,6 @@ static int command_ioctl(struct gpib_file_private *file_priv,
 		userbuf += bytes_written;
 		if (retval < 0) {
 			atomic_set(&desc->io_in_progress, 0);
-			atomic_dec(&desc->descriptor_busy);
 
 			wake_up_interruptible(&board->wait);
 			break;
Signature · 1 line
2.39.5 (Apple Git-154)