diff options
author | Petko Manolov <petkan@mip-labs.com> | 2016-04-27 07:24:49 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-04-28 17:05:24 -0400 |
commit | b7302ca05871e50208bc328cbc8199a21f5d876e (patch) | |
tree | c4b16a2f810dfd19988d1fc33d6f86ecfa331f25 | |
parent | 6c76f3d2922115f4e1327a2dcce47e94453e3375 (diff) |
pegasus: fixes URB buffer allocation size;
usb_fill_bulk_urb() receives buffer length parameter 8 bytes larger
than what's allocated by alloc_skb(); This seems to be a problem with
older (pegasus usb-1.1) devices, which may silently return more data
than the maximal packet length.
Reported-by: Lincoln Ramsay <a1291762@gmail.com>
Signed-off-by: Petko Manolov <petkan@mip-labs.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/usb/pegasus.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c index f84080215915..f919e20360c1 100644 --- a/drivers/net/usb/pegasus.c +++ b/drivers/net/usb/pegasus.c | |||
@@ -528,7 +528,7 @@ static void read_bulk_callback(struct urb *urb) | |||
528 | goon: | 528 | goon: |
529 | usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb, | 529 | usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb, |
530 | usb_rcvbulkpipe(pegasus->usb, 1), | 530 | usb_rcvbulkpipe(pegasus->usb, 1), |
531 | pegasus->rx_skb->data, PEGASUS_MTU + 8, | 531 | pegasus->rx_skb->data, PEGASUS_MTU, |
532 | read_bulk_callback, pegasus); | 532 | read_bulk_callback, pegasus); |
533 | rx_status = usb_submit_urb(pegasus->rx_urb, GFP_ATOMIC); | 533 | rx_status = usb_submit_urb(pegasus->rx_urb, GFP_ATOMIC); |
534 | if (rx_status == -ENODEV) | 534 | if (rx_status == -ENODEV) |
@@ -569,7 +569,7 @@ static void rx_fixup(unsigned long data) | |||
569 | } | 569 | } |
570 | usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb, | 570 | usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb, |
571 | usb_rcvbulkpipe(pegasus->usb, 1), | 571 | usb_rcvbulkpipe(pegasus->usb, 1), |
572 | pegasus->rx_skb->data, PEGASUS_MTU + 8, | 572 | pegasus->rx_skb->data, PEGASUS_MTU, |
573 | read_bulk_callback, pegasus); | 573 | read_bulk_callback, pegasus); |
574 | try_again: | 574 | try_again: |
575 | status = usb_submit_urb(pegasus->rx_urb, GFP_ATOMIC); | 575 | status = usb_submit_urb(pegasus->rx_urb, GFP_ATOMIC); |
@@ -823,7 +823,7 @@ static int pegasus_open(struct net_device *net) | |||
823 | 823 | ||
824 | usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb, | 824 | usb_fill_bulk_urb(pegasus->rx_urb, pegasus->usb, |
825 | usb_rcvbulkpipe(pegasus->usb, 1), | 825 | usb_rcvbulkpipe(pegasus->usb, 1), |
826 | pegasus->rx_skb->data, PEGASUS_MTU + 8, | 826 | pegasus->rx_skb->data, PEGASUS_MTU, |
827 | read_bulk_callback, pegasus); | 827 | read_bulk_callback, pegasus); |
828 | if ((res = usb_submit_urb(pegasus->rx_urb, GFP_KERNEL))) { | 828 | if ((res = usb_submit_urb(pegasus->rx_urb, GFP_KERNEL))) { |
829 | if (res == -ENODEV) | 829 | if (res == -ENODEV) |