bug fix in usbdevfs
PATCH 1/1 bug fix in usbdevfs
Hi,
I am sorry that the last patch about 32 bit compat ioctl on 64 bit kernel actually breaks the usbdevfs. That is on the current BK tree. I am retarded.
Here is the patch to fix it. Tested with USB hard disk and webcam in both 32bit compatible mode and native 64bit mode.
Again, sorry about that.
Chris
drivers/usb/core/devio.c +19 -21
@@ -1032,15 +1032,15 @@if (put_user (urb->error_count, &userurb->error_count))return -EFAULT ; -if (!(usb_pipeisoc (urb->pipe))) -return 0 ; -for (i =0 ; i < urb->number_of_packets; i++) { -if (put_user (urb->iso_frame_desc[i].actual_length, - &userurb->iso_frame_desc[i].actual_length)) -return -EFAULT ; -if (put_user (urb->iso_frame_desc[i].status, - &userurb->iso_frame_desc[i].status)) -return -EFAULT ; +if (usb_pipeisoc (urb->pipe)) { +for (i =0 ; i < urb->number_of_packets; i++) { +if (put_user (urb->iso_frame_desc[i].actual_length, + &userurb->iso_frame_desc[i].actual_length)) +return -EFAULT ; +if (put_user (urb->iso_frame_desc[i].status, + &userurb->iso_frame_desc[i].status)) +return -EFAULT ; + } }free_async (as);
@@ -1126,7 +1126,7 @@if (get_urb32 (&uurb,(struct usbdevfs_urb32 *)arg))return -EFAULT ; -return proc_do_submiturb (ps, &uurb, ((struct usbdevfs_urb __user *)arg)->iso_frame_desc, arg); +return proc_do_submiturb (ps, &uurb, ((struct usbdevfs_urb32 __user *)arg)->iso_frame_desc, arg); }static int processcompl_compat (struct async *as,void __user *__user *arg)
@@ -1146,15 +1146,15 @@if (put_user (urb->error_count, &userurb->error_count))return -EFAULT ; -if (!(usb_pipeisoc (urb->pipe))) -return 0 ; -for (i =0 ; i < urb->number_of_packets; i++) { -if (put_user (urb->iso_frame_desc[i].actual_length, - &userurb->iso_frame_desc[i].actual_length)) -return -EFAULT ; -if (put_user (urb->iso_frame_desc[i].status, - &userurb->iso_frame_desc[i].status)) -return -EFAULT ; +if (usb_pipeisoc (urb->pipe)) { +for (i =0 ; i < urb->number_of_packets; i++) { +if (put_user (urb->iso_frame_desc[i].actual_length, + &userurb->iso_frame_desc[i].actual_length)) +return -EFAULT ; +if (put_user (urb->iso_frame_desc[i].status, + &userurb->iso_frame_desc[i].status)) +return -EFAULT ; + } }free_async (as);
@@ -1177,10 +1177,8 @@ {struct async *as; -printk ("reapurbnblock\n" );if (!(as =async_getcompleted (ps)))return -EAGAIN ; -printk ("reap got as %p\n" , as);return processcompl_compat (as, (void __user *__user *)arg); }
Greg KH
AppliedQuoted 10 lines · Christopher Li
Hi,
I am sorry that the last patch about 32 bit compat ioctl on 64 bit kernel actually breaks the usbdevfs. That is on the current BK tree. I am retarded.
Here is the patch to fix it. Tested with USB hard disk and webcam in both 32bit compatible mode and native 64bit mode.
Again, sorry about that.
Applied, thanks.
greg k-h