Merge branch 'uprobes-v7' of git://git.linaro.org/people/dave.long/linux into devel-stable

This patch series adds basic uprobes support to ARM. It is based on
patches developed earlier by Rabin Vincent. That approach of adding
hooks into the kprobes instruction parsing code was not well received.
This approach separates the ARM instruction parsing code in kprobes out
into a separate set of functions which can be used by both kprobes and
uprobes. Both kprobes and uprobes then provide their own semantic action
tables to process the results of the parsing.

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/net/usb/sr9800.c b/drivers/net/usb/sr9800.c
index 4175eb9fdeca..b94a0fbb8b3b 100644
--- a/drivers/net/usb/sr9800.c
+++ b/drivers/net/usb/sr9800.c
@@ -63,6 +63,10 @@ static int sr_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
 {
         int offset = 0;
 
+        /* This check is no longer done by usbnet */
+        if (skb->len < dev->net->hard_header_len)
+                return 0;
+
         while (offset + sizeof(u32) < skb->len) {
                 struct sk_buff *sr_skb;
                 u16 size;
@@ -823,7 +827,7 @@ static int sr9800_bind(struct usbnet *dev, struct usb_interface *intf)
                 dev->rx_urb_size =
                         SR9800_BULKIN_SIZE[SR9800_MAX_BULKIN_2K].size;
         }
-        netdev_dbg(dev->net, "%s : setting rx_urb_size with : %ld\n", __func__,
+        netdev_dbg(dev->net, "%s : setting rx_urb_size with : %zu\n", __func__,
                    dev->rx_urb_size);
         return 0;