diff options
| author | Alan Stern <stern@rowland.harvard.edu> | 2021-06-07 11:23:07 -0400 |
|---|---|---|
| committer | Sasha Levin <sashal@kernel.org> | 2021-08-26 08:36:13 -0400 |
| commit | fc566b5a21f5bcdc8355906bd4c43bf45dd4fa52 (patch) | |
| tree | e3977780410e0b31fdc78a967a7e902e91a85572 | |
| parent | 1bd505c814ccca797f291a3f788b4f695ee1b95b (diff) | |
| download | linux-stable-fc566b5a21f5bcdc8355906bd4c43bf45dd4fa52.tar.gz linux-stable-fc566b5a21f5bcdc8355906bd4c43bf45dd4fa52.tar.bz2 linux-stable-fc566b5a21f5bcdc8355906bd4c43bf45dd4fa52.zip | |
USB: core: Avoid WARNings for 0-length descriptor requests
[ Upstream commit 60dfe484cef45293e631b3a6e8995f1689818172 ]
The USB core has utility routines to retrieve various types of
descriptors. These routines will now provoke a WARN if they are asked
to retrieve 0 bytes (USB "receive" requests must not have zero
length), so avert this by checking the size argument at the start.
CC: Johan Hovold <johan@kernel.org>
Reported-and-tested-by: syzbot+7dbcd9ff34dc4ed45240@syzkaller.appspotmail.com
Reviewed-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20210607152307.GD1768031@rowland.harvard.edu
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/usb/core/message.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index 041c68ea329f..7ca908704777 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -647,6 +647,9 @@ int usb_get_descriptor(struct usb_device *dev, unsigned char type, int i; int result; + if (size <= 0) /* No point in asking for no data */ + return -EINVAL; + memset(buf, 0, size); /* Make sure we parse really received data */ for (i = 0; i < 3; ++i) { @@ -695,6 +698,9 @@ static int usb_get_string(struct usb_device *dev, unsigned short langid, int i; int result; + if (size <= 0) /* No point in asking for no data */ + return -EINVAL; + for (i = 0; i < 3; ++i) { /* retry on length 0 or stall; some devices are flakey */ result = usb_control_msg(dev, usb_rcvctrlpipe(dev, 0), |