From patchwork Tue Oct 19 15:29:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrej Shadura X-Patchwork-Id: 12570399 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0C34DC433FE for ; Tue, 19 Oct 2021 15:29:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EE3FC61074 for ; Tue, 19 Oct 2021 15:29:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234361AbhJSPbq (ORCPT ); Tue, 19 Oct 2021 11:31:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234326AbhJSPbl (ORCPT ); Tue, 19 Oct 2021 11:31:41 -0400 Received: from cambridge.shadura.me (cambridge.shadura.me [IPv6:2a00:1098:0:86:1000:13:0:1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D13DC061746; Tue, 19 Oct 2021 08:29:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=shadura.me; s=a; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Content-Type:Sender:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID; bh=3D/0yrAO/4aqchQZ3ijy1OgCI6b49XUV93K2poOrz1I=; b=X6Jzq+ zQAn3bljvKm3C3gen2toawEl6V4WHi6hvxiHUIfDa0lCUe5+lvBb1sAM3wU/P/3gEPhBoj2G7a2HO r191ARSRfQFErI1UIrowM1vnOcSZCEjDV0r1vHtZph/SDfS8RadxKMZYf+aJo+uvumAMSrqiL3xX+ OrWbbEcLkeY=; Received: from 178-143-43-60.dynamic.orange.sk ([178.143.43.60] helo=localhost) by cambridge.shadura.me with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mcr3O-0002yT-IF; Tue, 19 Oct 2021 17:29:26 +0200 From: Andrej Shadura To: =?utf-8?b?SmnFmcOtIEtvc2luYQ==?= Cc: linux-input@vger.kernel.org, linux-usb@vger.kernel.org, stable@vger.kernel.org, kernel@collabora.com, Alan Stern Subject: [PATCH v3 2/2] HID: u2fzero: properly handle timeouts in usb_submit_urb Date: Tue, 19 Oct 2021 17:29:17 +0200 Message-Id: <20211019152917.79666-2-andrew.shadura@collabora.co.uk> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211019152917.79666-1-andrew.shadura@collabora.co.uk> References: <20211019152917.79666-1-andrew.shadura@collabora.co.uk> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org 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 --- 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 94f78ffb76d0..67ae2b18e33a 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 {