From: Adam Crosser <adam.r.crosser@gmail.com>
To: Dave Penkler <dpenkler@gmail.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Andreas Kleinbichler <andi.kleinbichler@gmail.com>,
Luke Yang <lukeyang.dev@gmail.com>,
Al Viro <viro@zeniv.linux.org.uk>,
Adam Crosser <adam.crosser@praetorian.com>,
linux-kernel@vger.kernel.org, Ruikai Peng <ruikai@pwno.io>
Subject: [PATCH] gpib: fix double decrement of descriptor_busy in command_ioctl()
Date: Fri, 24 Apr 2026 19:37:47 +0700 [thread overview]
Message-ID: <20260424123750.855863-1-adam.r.crosser@gmail.com> (raw)
From: Adam Crosser <adam.crosser@praetorian.com>
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")
Reported-by: Ruikai Peng <ruikai@pwno.io>
Signed-off-by: Adam Crosser <adam.crosser@praetorian.com>
---
drivers/gpib/common/gpib_os.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/gpib/common/gpib_os.c b/drivers/gpib/common/gpib_os.c
index 97c98f0..2b4ec6a 100644
--- a/drivers/gpib/common/gpib_os.c
+++ b/drivers/gpib/common/gpib_os.c
@@ -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;
--
2.39.5 (Apple Git-154)
reply other threads:[~2026-04-24 12:38 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260424123750.855863-1-adam.r.crosser@gmail.com \
--to=adam.r.crosser@gmail.com \
--cc=adam.crosser@praetorian.com \
--cc=andi.kleinbichler@gmail.com \
--cc=dpenkler@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lukeyang.dev@gmail.com \
--cc=ruikai@pwno.io \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox