]> err.no Git - linux-2.6/commitdiff
cdc-wdm endianness fixes
authorAl Viro <viro@ftp.linux.org.uk>
Mon, 2 Jun 2008 09:59:02 +0000 (10:59 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Jun 2008 15:06:01 +0000 (08:06 -0700)
* wMaxPacketSize is le16; copying it to a field of local structure and then
  using that field as host-endian (size of object to be allocated) is broken.
* bMaxPacketSize0 is 8-bit; feeding it to le16_to_cpu() is bogus and since the
  result is used as host-endian, it's not even misspelled cpu_to_le16().

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/usb/class/cdc-wdm.c

index 107666d4e2eccc6cee761caeab5fa1c5590243d8..731db051070a82d63a5eeebe048c6ab314b92810 100644 (file)
@@ -611,8 +611,8 @@ next_desc:
                goto err;
        }
 
-       desc->wMaxPacketSize = ep->wMaxPacketSize;
-       desc->bMaxPacketSize0 = cpu_to_le16(udev->descriptor.bMaxPacketSize0);
+       desc->wMaxPacketSize = le16_to_cpu(ep->wMaxPacketSize);
+       desc->bMaxPacketSize0 = udev->descriptor.bMaxPacketSize0;
 
        desc->orq = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL);
        if (!desc->orq)