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

Commit e35d476b authored by Evgeny Novikov's avatar Evgeny Novikov Committed by Greg Kroah-Hartman
Browse files

USB: lvtest: return proper error code in probe 



commit 531412492ce93ea29b9ca3b4eb5e3ed771f851dd upstream.

lvs_rh_probe() can return some nonnegative value from usb_control_msg()
when it is less than "USB_DT_HUB_NONVAR_SIZE + 2" that is considered as
a failure. Make lvs_rh_probe() return -EINVAL in this case.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: default avatarEvgeny Novikov <novikov@ispras.ru>
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200805090643.3432-1-novikov@ispras.ru


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ae021a90

drivers/usb/misc/lvstest.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ static int lvs_rh_probe(struct usb_interface *intf, 
			USB_DT_SS_HUB_SIZE, USB_CTRL_GET_TIMEOUT);

	if (ret < (USB_DT_HUB_NONVAR_SIZE + 2)) {

		dev_err(&hdev->dev, "wrong root hub descriptor read %d\n", ret);

		return ret;

		return ret < 0 ? ret : -EINVAL;

	}



	/* submit urb to poll interrupt endpoint */