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=-11.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 13A48C433DF for ; Wed, 27 May 2020 08:45:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E58172073B for ; Wed, 27 May 2020 08:45:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590569106; bh=Sf/mhX2en66yeJ/meLfpWrL3dt8265s+EftpFCpEvI8=; h=Subject:To:From:Date:List-ID:From; b=jPeqfYDAVy90VCSOuXqNZI9xbT5laMwirjhOs2Ab6lzJ2nTvnSfaecEzhZo1S7SEu JbhKvdRHRQrMyXdWMQag+hwBhCIny5yri4V42jZzWBu4LTHpRHtjTtco++05dodD6E jmbzB5OYlCmmfFUjhl2Q84Kh3WpMLH3rcU+Y1URM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388252AbgE0IpG (ORCPT ); Wed, 27 May 2020 04:45:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:46728 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388211AbgE0IpG (ORCPT ); Wed, 27 May 2020 04:45:06 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 F30D120723; Wed, 27 May 2020 08:45:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590569105; bh=Sf/mhX2en66yeJ/meLfpWrL3dt8265s+EftpFCpEvI8=; h=Subject:To:From:Date:From; b=zu3k2YCCnaQ9NjTebo+U5bR3dnxvmzJ1s8bp4xbAm9zqjM050A3x/vcAhl/7rKSbf qK0d7qtWAvzi3/j3FzHinw2ya0renjRxDJaEzSdAk/YfqQ/0C1eik93vVn+XTyEctn Qs1NSB2IqHVi9zqBx3wNosKKq2AKBn6+RNhF8acI= Subject: patch "CDC-ACM: heed quirk also in error handling" added to usb-testing To: oneukum@suse.com, gregkh@linuxfoundation.org, jdawin@math.uni-bielefeld.de, stable@vger.kernel.org From: Date: Wed, 27 May 2020 10:45:03 +0200 Message-ID: <15905691035988@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This is a note to let you know that I've just added the patch titled CDC-ACM: heed quirk also in error handling to my usb git tree which can be found at git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git in the usb-testing branch. The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.) The patch will be merged to the usb-next branch sometime soon, after it passes testing, and the merge window is open. If you have any questions about this process, please let me know. >From 97fe809934dd2b0b37dfef3a2fc70417f485d7af Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Tue, 26 May 2020 14:44:20 +0200 Subject: CDC-ACM: heed quirk also in error handling If buffers are iterated over in the error case, the lower limits for quirky devices must be heeded. Signed-off-by: Oliver Neukum Reported-by: Jean Rene Dawin Fixes: a4e7279cd1d19 ("cdc-acm: introduce a cool down") Cc: stable Link: https://lore.kernel.org/r/20200526124420.22160-1-oneukum@suse.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/class/cdc-acm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index ded8d93834ca..f67088bb8218 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -584,7 +584,7 @@ static void acm_softint(struct work_struct *work) } if (test_and_clear_bit(ACM_ERROR_DELAY, &acm->flags)) { - for (i = 0; i < ACM_NR; i++) + for (i = 0; i < acm->rx_buflimit; i++) if (test_and_clear_bit(i, &acm->urbs_in_error_delay)) acm_submit_read_urb(acm, i, GFP_NOIO); } -- 2.26.2