diff options
| author |   Oliver Neukum <oneukum@suse.com> | 2024-09-12 14:54:43 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-09-13 07:54:50 +0200 |
| commit | 49cd2f4d747eeb3050b76245a7f72aa99dbd3310 (patch) | |
| tree | 96b151fa4f63c72378c261ca38a898437d3e2d8c | |
| parent | USB: appledisplay: close race between probe and completion handler (diff) | |
| download | wireguard-linux-49cd2f4d747eeb3050b76245a7f72aa99dbd3310.tar.xz wireguard-linux-49cd2f4d747eeb3050b76245a7f72aa99dbd3310.zip | |
USB: misc: cypress_cy7c63: check for short transfer
As we process the second byte of a control transfer, transfers
of less than 2 bytes must be discarded.
This bug is as old as the driver.
SIgned-off-by: Oliver Neukum <oneukum@suse.com>
CC: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20240912125449.1030536-1-oneukum@suse.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/misc/cypress_cy7c63.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/misc/cypress_cy7c63.c b/drivers/usb/misc/cypress_cy7c63.c index cecd7693b741..75f5a740cba3 100644 --- a/drivers/usb/misc/cypress_cy7c63.c +++ b/drivers/usb/misc/cypress_cy7c63.c @@ -88,6 +88,9 @@ static int vendor_command(struct cypress *dev, unsigned char request, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_OTHER, address, data, iobuf, CYPRESS_MAX_REQSIZE, USB_CTRL_GET_TIMEOUT); + /* we must not process garbage */ + if (retval < 2) + goto err_buf; /* store returned data (more READs to be added) */ switch (request) { @@ -107,6 +110,7 @@ static int vendor_command(struct cypress *dev, unsigned char request, break; } +err_buf: kfree(iobuf); error: return retval; |