1 files changed, 12 insertions, 6 deletions

diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index abde271c18ae..18ddf9684a27 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -2567,20 +2567,26 @@ __wsum __skb_checksum(const struct sk_buff *skb, int offset, int len,
 __wsum skb_checksum(const struct sk_buff *skb, int offset, int len,
                     __wsum csum);
 
-static inline void *skb_header_pointer(const struct sk_buff *skb, int offset,
-                                       int len, void *buffer)
+static inline void *__skb_header_pointer(const struct sk_buff *skb, int offset,
+                                         int len, void *data, int hlen, void *buffer)
 {
-        int hlen = skb_headlen(skb);
-
         if (hlen - offset >= len)
-                return skb->data + offset;
+                return data + offset;
 
-        if (skb_copy_bits(skb, offset, buffer, len) < 0)
+        if (!skb ||
+            skb_copy_bits(skb, offset, buffer, len) < 0)
                 return NULL;
 
         return buffer;
 }
 
+static inline void *skb_header_pointer(const struct sk_buff *skb, int offset,
+                                       int len, void *buffer)
+{
+        return __skb_header_pointer(skb, offset, len, skb->data,
+                                    skb_headlen(skb), buffer);
+}
+
 /**
  *      skb_needs_linearize - check if we need to linearize a given skb
  *                            depending on the given device features.