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

Commit d3dd1a05 authored by Andrej Shadura's avatar Andrej Shadura Committed by Greg Kroah-Hartman
Browse files

HID: u2fzero: properly handle timeouts in usb_submit_urb 



[ Upstream commit 43775e62c4b784f44a159e13ba80e6146a42d502 ]

The wait_for_completion_timeout function returns 0 if timed out or a
positive value if completed. Hence, "less than zero" comparison always
misses timeouts and doesn't kill the URB as it should, leading to
re-sending it while it is active.

Fixes: 42337b9d ("HID: add driver for U2F Zero built-in LED and RNG")
Signed-off-by: default avatarAndrej Shadura <andrew.shadura@collabora.co.uk>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b216a39b

drivers/hid/hid-u2fzero.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static int u2fzero_recv(struct u2fzero_device *dev, 


	ret = (wait_for_completion_timeout(

		&ctx.done, msecs_to_jiffies(USB_CTRL_SET_TIMEOUT)));

	if (ret < 0) {

	if (ret == 0) {

		usb_kill_urb(dev->urb);

		hid_err(hdev, "urb submission timed out");

	} else {