Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[cascardo/linux.git] / net / ipv4 / ip_fragment.c

diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index 0e0ab98..fdaabf2 100644 (file)
--- a/net/ipv4/ip_fragment.c
+++ b/net/ipv4/ip_fragment.c
@@ -599,8 +599,8 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
                head->next = clone;
                skb_shinfo(clone)->frag_list = skb_shinfo(head)->frag_list;
                skb_frag_list_init(head);
-               for (i=0; i<skb_shinfo(head)->nr_frags; i++)
-                       plen += skb_shinfo(head)->frags[i].size;
+               for (i = 0; i < skb_shinfo(head)->nr_frags; i++)
+                       plen += skb_frag_size(&skb_shinfo(head)->frags[i]);
                clone->len = clone->data_len = head->data_len - plen;
                head->data_len -= clone->len;
                head->len -= clone->len;
@@ -682,6 +682,42 @@ int ip_defrag(struct sk_buff *skb, u32 user)
 }
 EXPORT_SYMBOL(ip_defrag);
 
+struct sk_buff *ip_check_defrag(struct sk_buff *skb, u32 user)
+{
+       const struct iphdr *iph;
+       u32 len;
+
+       if (skb->protocol != htons(ETH_P_IP))
+               return skb;
+
+       if (!pskb_may_pull(skb, sizeof(struct iphdr)))
+               return skb;
+
+       iph = ip_hdr(skb);
+       if (iph->ihl < 5 || iph->version != 4)
+               return skb;
+       if (!pskb_may_pull(skb, iph->ihl*4))
+               return skb;
+       iph = ip_hdr(skb);
+       len = ntohs(iph->tot_len);
+       if (skb->len < len || len < (iph->ihl * 4))
+               return skb;
+
+       if (ip_is_fragment(ip_hdr(skb))) {
+               skb = skb_share_check(skb, GFP_ATOMIC);
+               if (skb) {
+                       if (pskb_trim_rcsum(skb, len))
+                               return skb;
+                       memset(IPCB(skb), 0, sizeof(struct inet_skb_parm));
+                       if (ip_defrag(skb, user))
+                               return NULL;
+                       skb->rxhash = 0;
+               }
+       }
+       return skb;
+}
+EXPORT_SYMBOL(ip_check_defrag);
+
 #ifdef CONFIG_SYSCTL
 static int zero;