From: Lu Baolu <baolu.lu@linux.intel.com>
Date: Wed, 30 Dec 2015 04:59:08 +0000 (+0800)
Subject: usb: cdc-acm: handle unlinked urb in acm read callback
X-Git-Tag: v4.1.12-92~150^2~266
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bacb6e7a96b307e809d7d536b0c60544912a4cf4;p=users%2Fjedix%2Flinux-maple.git

usb: cdc-acm: handle unlinked urb in acm read callback

Orabug: 23330778

[ Upstream commit 19454462acb1bdef80542061bdc9b410e4ed1ff6 ]

In current acm driver, the bulk-in callback function ignores the
URBs unlinked in usb core.

This causes unexpected data loss in some cases. For example,
runtime suspend entry will unlinked all urbs and set urb->status
to -ENOENT even those urbs might have data not processed yet.
Hence, data loss occurs.

This patch lets bulk-in callback function handle unlinked urbs
to avoid data loss.

Signed-off-by: Tang Jian Qiang <jianqiang.tang@intel.com>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Cc: stable@vger.kernel.org
Acked-by: Oliver Neukum <oneukum@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
(cherry picked from commit 6cdc037a9b649209051e3c982d5fcaf31274cb55)

Signed-off-by: Dan Duval <dan.duval@oracle.com>
---

diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index a086e1d69bc70..cd03fe07f1b19 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -432,7 +432,8 @@ static void acm_read_bulk_callback(struct urb *urb)
 		set_bit(rb->index, &acm->read_urbs_free);
 		dev_dbg(&acm->data->dev, "%s - non-zero urb status: %d\n",
 							__func__, status);
-		return;
+		if ((status != -ENOENT) || (urb->actual_length == 0))
+			return;
 	}
 
 	usb_mark_last_busy(acm->dev);