diff mbox series

[5.6,33/41] CDC-ACM: heed quirk also in error handling

Message ID	20200609174115.238537419@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=P6Qw=7W=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Oliver Neukum <oneukum@suse.com>, Jean Rene Dawin <jdawin@math.uni-bielefeld.de> Subject: [PATCH 5.6 33/41] CDC-ACM: heed quirk also in error handling Date: Tue, 9 Jun 2020 19:45:35 +0200 Message-Id: <20200609174115.238537419@linuxfoundation.org> In-Reply-To: <20200609174112.129412236@linuxfoundation.org> References: <20200609174112.129412236@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
Series	None \| expand [5.6,02/41] l2tp: add sk_family checks to l2tp_validate_socket [5.6,04/41] net: check untrusted gso_size at kernel entry [5.6,06/41] net: stmmac: enable timestamp snapshot for required PTP packets in dwmac v5.10a [5.6,07/41] net: usb: qmi_wwan: add Telit LE910C1-EUX composition [5.6,08/41] NFC: st21nfca: add missed kfree_skb() in an error path [5.6,09/41] nfp: flower: fix used time of merge flow statistics [5.6,10/41] sctp: check assoc before SCTP_ADDR_{MADE_PRIM, ADDED} event [5.6,11/41] virtio_vsock: Fix race condition in virtio_transport_recv_pkt [5.6,13/41] net: be more gentle about silly gso requests coming from user [5.6,15/41] mptcp: fix unblocking connect() [5.6,16/41] net/sched: fix infinite loop in sch_fq_pie [5.6,19/41] USB: serial: usb_wwan: do not resubmit rx urb on fatal errors [5.6,20/41] USB: serial: option: add Telit LE910C1-EUX compositions [5.6,23/41] iio:chemical:sps30: Fix timestamp alignment [5.6,24/41] iio: vcnl4000: Fix i2c swapped word reading. [5.6,25/41] iio:chemical:pms7003: Fix timestamp alignment and prevent data leak. [5.6,27/41] usb: musb: start session in resume for host port [5.6,31/41] tty: hvc_console, fix crashes on parallel open/close [5.6,32/41] staging: rtl8712: Fix IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK [5.6,33/41] CDC-ACM: heed quirk also in error handling [5.6,34/41] nvmem: qfprom: remove incorrect write support [5.6,36/41] x86/cpu: Add table argument to cpu_matches() [5.6,40/41] uprobes: ensure that uprobe->offset and ->ref_ctr_offset are properly aligned

Commit Message

Greg KH June 9, 2020, 5:45 p.m. UTC

From: Oliver Neukum <oneukum@suse.com>

commit 97fe809934dd2b0b37dfef3a2fc70417f485d7af upstream.

If buffers are iterated over in the error case, the lower limits
for quirky devices must be heeded.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
Reported-by: Jean Rene Dawin <jdawin@math.uni-bielefeld.de>
Fixes: a4e7279cd1d19 ("cdc-acm: introduce a cool down")
Cc: stable <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20200526124420.22160-1-oneukum@suse.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/usb/class/cdc-acm.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff mbox series

Patch

--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -584,7 +584,7 @@  static void acm_softint(struct work_stru
 	}
 
 	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);
 	}