Commit aee3603b authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] fix invalid/illegal oddments in USB

parent 97a7a9c6
...@@ -471,7 +471,7 @@ static int ch9_postconfig (struct usbtest_dev *dev) ...@@ -471,7 +471,7 @@ static int ch9_postconfig (struct usbtest_dev *dev)
* they're ordered meaningfully in this array * they're ordered meaningfully in this array
*/ */
if (iface->altsetting [i].desc.bAlternateSetting != i) { if (iface->altsetting [i].desc.bAlternateSetting != i) {
dbg ("%s, illegal alt [%d].bAltSetting = %d", dbg ("%s, invalid alt [%d].bAltSetting = %d",
dev->id, i, dev->id, i,
iface->altsetting [i].desc iface->altsetting [i].desc
.bAlternateSetting); .bAlternateSetting);
......
...@@ -890,7 +890,7 @@ static int genelink_rx_fixup (struct usbnet *dev, struct sk_buff *skb) ...@@ -890,7 +890,7 @@ static int genelink_rx_fixup (struct usbnet *dev, struct sk_buff *skb)
le32_to_cpus (&header->packet_count); le32_to_cpus (&header->packet_count);
if ((header->packet_count > GL_MAX_TRANSMIT_PACKETS) if ((header->packet_count > GL_MAX_TRANSMIT_PACKETS)
|| (header->packet_count < 0)) { || (header->packet_count < 0)) {
dbg ("genelink: illegal received packet count %d", dbg ("genelink: invalid received packet count %d",
header->packet_count); header->packet_count);
return 0; return 0;
} }
...@@ -907,7 +907,7 @@ static int genelink_rx_fixup (struct usbnet *dev, struct sk_buff *skb) ...@@ -907,7 +907,7 @@ static int genelink_rx_fixup (struct usbnet *dev, struct sk_buff *skb)
// this may be a broken packet // this may be a broken packet
if (size > GL_MAX_PACKET_LEN) { if (size > GL_MAX_PACKET_LEN) {
dbg ("genelink: illegal rx length %d", size); dbg ("genelink: invalid rx length %d", size);
return 0; return 0;
} }
...@@ -943,7 +943,7 @@ static int genelink_rx_fixup (struct usbnet *dev, struct sk_buff *skb) ...@@ -943,7 +943,7 @@ static int genelink_rx_fixup (struct usbnet *dev, struct sk_buff *skb)
skb_pull (skb, 4); skb_pull (skb, 4);
if (skb->len > GL_MAX_PACKET_LEN) { if (skb->len > GL_MAX_PACKET_LEN) {
dbg ("genelink: illegal rx length %d", skb->len); dbg ("genelink: invalid rx length %d", skb->len);
return 0; return 0;
} }
return 1; return 1;
...@@ -2769,6 +2769,15 @@ static const struct usb_device_id products [] = { ...@@ -2769,6 +2769,15 @@ static const struct usb_device_id products [] = {
.bInterfaceSubClass = 0x0a, .bInterfaceSubClass = 0x0a,
.bInterfaceProtocol = 0x00, .bInterfaceProtocol = 0x00,
.driver_info = (unsigned long) &zaurus_slc700_info, .driver_info = (unsigned long) &zaurus_slc700_info,
}, {
.match_flags = USB_DEVICE_ID_MATCH_INT_INFO
| USB_DEVICE_ID_MATCH_DEVICE,
.idVendor = 0x04DD,
.idProduct = 0x9031,
.bInterfaceClass = 0x02,
.bInterfaceSubClass = 0x0a,
.bInterfaceProtocol = 0x00,
.driver_info = (unsigned long) &zaurus_sla300_info,
}, },
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment