Thread (6 messages) 6 messages, 3 authors, 2016-01-20

Re: [PATCH v3 1/1] usb: cdc-acm: handle unlinked urb in acm read callback

From: Lu Baolu <baolu.lu@linux.intel.com>
Date: 2016-01-20 07:22:51
Also in: lkml

Hi Jianqiang,

I think you need to wait until the release of 4.5-rc1.

Thanks,
Baolu

On 01/20/2016 03:08 PM, Tang, Jianqiang wrote:
quoted hunk ↗ jump to hunk
Hi Greg,

   Sorry to disturb you although I know you are very busy  :) 
   One question is about this patch, does the patch already in the process of merge into kernel?
   Or need modify still? 

Thanks a lot!

-----Original Message-----
From: linux-usb-owner@vger.kernel.org [mailto:linux-usb-owner@vger.kernel.org] On Behalf Of Lu Baolu
Sent: Wednesday, December 30, 2015 12:59 PM
To: Oliver Neukum <oliver@neukum.org>; Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org; linux-kernel@vger.kernel.org; Lu Baolu <baolu.lu@linux.intel.com>; Tang, Jianqiang <redacted>; stable@vger.kernel.org
Subject: [PATCH v3 1/1] usb: cdc-acm: handle unlinked urb in acm read callback

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 <redacted>
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
Cc: stable@vger.kernel.org
Acked-by: Oliver Neukum <oneukum@suse.com>
---
 drivers/usb/class/cdc-acm.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

change log:
v1->v2:
add Acked-by: Oliver Neukum [off-list ref].

v2->v3:
add the change log.
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 26ca4f9..8cd193b 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -428,7 +428,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);
--
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at  http://vger.kernel.org/majordomo-info.html
  
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help