All of lore.kernel.org
 help / color / mirror / Atom feed
From: Hyunjung Ko <hj351016@gmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Guido Kiener <guido@kiener-muenchen.de>,
	linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
	stable@vger.kernel.org, Hyunjung Ko <hj351016@gmail.com>
Subject: [PATCH] usb: usbtmc: reject a short READ_STATUS_BYTE control transfer
Date: Thu, 19 Nov 2026 17:39:59 +0900	[thread overview]
Message-ID: <20261119083959.1599898-1-hj351016@gmail.com> (raw)

usbtmc_get_stb() asks the device for three bytes of the READ_STATUS_BYTE
response into a kmalloc()'d buffer and only checks that usb_control_msg()
did not fail:

	buffer = kmalloc(8, GFP_KERNEL);
	...
	rv = usb_control_msg(..., buffer, 0x03, USB_CTRL_GET_TIMEOUT);
	if (rv < 0)
		goto exit;

usb_control_msg() returns the number of bytes actually transferred,
which a device is free to make shorter than the three that were
requested.  When the interface has no interrupt-in endpoint the status
byte is then taken straight from the third byte:

	*stb = buffer[2];

and the caller hands it to user space with put_user() from
USBTMC488_IOCTL_READ_STB and USBTMC_IOCTL_GET_SRQ_STB.  A device that
answers with one or two bytes - with the first byte set to
USBTMC_STATUS_SUCCESS so the status check passes - therefore leaks one
byte of uninitialised kmalloc memory to user space.  Both conditions are
under the device's control, since it also decides whether to expose an
interrupt-in endpoint.

The same leak was fixed once before in this driver: usbtmc_ioctl_request()
bounds its copy_to_user() to the number of bytes usb_control_msg() reported
instead of the number requested.  usbtmc_get_stb() cannot be fixed that way
because it reads a fixed offset, so reject the transfer unless all three
bytes arrived, matching what usbtmc488_ioctl_simple() already does for its
own one-byte request.

The check is not limited to the branch that reads buffer[2]: buffer[0] is
consumed on both paths, so a short response leaves the status check itself
reading uninitialised memory.  USBTMC-USB488 4.3.1 requires the three-byte
response, so a device that sends fewer is not conforming either way.

Signed-off-by: Hyunjung Ko <hj351016@gmail.com>
Cc: stable@vger.kernel.org
---
 drivers/usb/class/usbtmc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c
index 51cd9320a736..c5b91a446a72 100644
--- a/drivers/usb/class/usbtmc.c
+++ b/drivers/usb/class/usbtmc.c
@@ -506,6 +506,10 @@ static int usbtmc_get_stb(struct usbtmc_file_data *file_data, __u8 *stb)
 	if (rv < 0) {
 		dev_err(dev, "stb usb_control_msg returned %d\n", rv);
 		goto exit;
+	} else if (rv != 3) {
+		dev_warn(dev, "stb usb_control_msg returned %d\n", rv);
+		rv = -EIO;
+		goto exit;
 	}
 
 	if (buffer[0] != USBTMC_STATUS_SUCCESS) {

             reply	other threads:[~2026-11-19  8:40 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-19  8:39 Hyunjung Ko [this message]
2026-11-19  8:45 ` [PATCH] usb: usbtmc: reject a short READ_STATUS_BYTE control transfer sashiko-bot
2026-11-19 13:13 ` Greg Kroah-Hartman
2026-11-19 13:25   ` khj

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=20261119083959.1599898-1-hj351016@gmail.com \
    --to=hj351016@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=guido@kiener-muenchen.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.