| From 727660b022d812f20d89c69e1b806f7f991a9e9b Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 19 Oct 2021 17:29:17 +0200 |
| Subject: HID: u2fzero: properly handle timeouts in usb_submit_urb |
| |
| From: Andrej Shadura <andrew.shadura@collabora.co.uk> |
| |
| [ 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: 42337b9d4d95 ("HID: add driver for U2F Zero built-in LED and RNG") |
| Signed-off-by: Andrej Shadura <andrew.shadura@collabora.co.uk> |
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/hid/hid-u2fzero.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/hid/hid-u2fzero.c b/drivers/hid/hid-u2fzero.c |
| index 94f78ffb76d04..67ae2b18e33ac 100644 |
| --- a/drivers/hid/hid-u2fzero.c |
| +++ b/drivers/hid/hid-u2fzero.c |
| @@ -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 { |
| -- |
| 2.33.0 |
| |