Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc566b5a authored by Alan Stern's avatar Alan Stern Committed by Sasha Levin
Browse files

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: default avatar <syzbot+7dbcd9ff34dc4ed45240@syzkaller.appspotmail.com>
Reviewed-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Link: https://lore.kernel.org/r/20210607152307.GD1768031@rowland.harvard.edu


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1bd505c8

drivers/usb/core/message.c

+6 −0
Original line number Diff line number Diff line
@@ -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),