[gentoo-commits] gentoo-x86 commit in dev-libs/libusb/files: libusb-0.1.12-no-infinite-bulk.patch

[Robin H. Johnson (robbat2)]

robbat2     08/06/25 03:25:45

  Added:                libusb-0.1.12-no-infinite-bulk.patch
  Log:
  Bug #225879, fix infinite looping during usb_bulk operations.
  (Portage version: 2.2_rc1/cvs/Linux 2.6.26-rc4-00103-g1beee8d x86_64)

Revision  Changes    Path
1.1                  dev-libs/libusb/files/libusb-0.1.12-no-infinite-bulk.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libusb/files/libusb-0.1.12-no-infinite-bulk.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libusb/files/libusb-0.1.12-no-infinite-bulk.patch?rev=1.1&content-type=text/plain

Index: libusb-0.1.12-no-infinite-bulk.patch
===================================================================
Patch-from: http://bugs.gentoo.org/show_bug.cgi?id=225879
Gentoo-Bug: 225879
Signed-off-by: Robin H. Johnson <robbat2@g.o>

Prevents an infinite loop if device is removed during usb_bulk_read or
usb_bulk_write.

diff -Naur libusb-0.1.12/linux.c libusb-0.1.12-new/linux.c
--- libusb-0.1.12/linux.c	2006-03-04 04:52:46.000000000 +0200
+++ libusb-0.1.12-new/linux.c	2008-06-11 14:22:20.000000000 +0300
@@ -220,6 +220,13 @@
     waiting = 1;
     context = NULL;
     while (!urb.usercontext && ((ret = ioctl(dev->fd, IOCTL_USB_REAPURBNDELAY, &context)) == -1) && waiting) {
+      if (ret == -1)
+      {
+      	if (errno == ENODEV)
+	{
+	  return -ENODEV;
+	}
+      }
       tv.tv_sec = 0;
       tv.tv_usec = 1000; // 1 msec
       select(dev->fd + 1, NULL, &writefds, NULL, &tv); //sub second wait



-- 
gentoo-commits@l.g.o mailing list