From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE82ACA9ED4 for ; Mon, 4 Nov 2019 22:28:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9AABF2080F for ; Mon, 4 Nov 2019 22:28:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572906511; bh=GOtZoZsLW0AdOVaZLiOTUGOwZ7jtgIn2nMcrlPlbhEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=aNG9H9C+Z37ydk999vAToN4OWa9Q3677DK3ZYjYsFHsUQzUx5uja93AXx2hWMm2Mw XxiSoftXdZlYoTX8vV3Y+s/qYP5MPvEmxGVoUTcP05lhYWBCorj5JX24Wdlq1hvMhD x29HUi7yFTHlOGYZBuJDVqnra4L2fWoPYBWsWbLQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730230AbfKDVtF (ORCPT ); Mon, 4 Nov 2019 16:49:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:39996 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730158AbfKDVtA (ORCPT ); Mon, 4 Nov 2019 16:49:00 -0500 Received: from localhost (6.204-14-84.ripe.coltfrance.com [84.14.204.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0A7D9214D8; Mon, 4 Nov 2019 21:48:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1572904139; bh=GOtZoZsLW0AdOVaZLiOTUGOwZ7jtgIn2nMcrlPlbhEY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WvVjatjyIDrwxXuL0UWjdcj8dfTWF1/BaT/bepqE5ZdcP9NxtX/byma1dLs2jMoo7 bWGT89YgMBmeXKA96z+mDV5fo1haZqTxw2NvLKomN+I/u4eY1c0qsBBxDyYXYX6kr+ OBqRHo3Chhn1FuSglEzGI+GSMnGG06Lh0OC+lhbA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+a4fbb3bb76cda0ea4e58@syzkaller.appspotmail.com, Johan Hovold Subject: [PATCH 4.4 31/46] USB: ldusb: fix control-message timeout Date: Mon, 4 Nov 2019 22:45:02 +0100 Message-Id: <20191104211904.175898997@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191104211830.912265604@linuxfoundation.org> References: <20191104211830.912265604@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Johan Hovold commit 52403cfbc635d28195167618690595013776ebde upstream. USB control-message timeouts are specified in milliseconds, not jiffies. Waiting 83 minutes for a transfer to complete is a bit excessive. Fixes: 2824bd250f0b ("[PATCH] USB: add ldusb driver") Cc: stable # 2.6.13 Reported-by: syzbot+a4fbb3bb76cda0ea4e58@syzkaller.appspotmail.com Signed-off-by: Johan Hovold Link: https://lore.kernel.org/r/20191022153127.22295-1-johan@kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/usb/misc/ldusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/usb/misc/ldusb.c +++ b/drivers/usb/misc/ldusb.c @@ -584,7 +584,7 @@ static ssize_t ld_usb_write(struct file 1 << 8, 0, dev->interrupt_out_buffer, bytes_to_write, - USB_CTRL_SET_TIMEOUT * HZ); + USB_CTRL_SET_TIMEOUT); if (retval < 0) dev_err(&dev->intf->dev, "Couldn't submit HID_REQ_SET_REPORT %d\n",