projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
inet: frags: fix defragmented packet's IP header for af_packet
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv4
/
ip_fragment.c
diff --git
a/net/ipv4/ip_fragment.c
b/net/ipv4/ip_fragment.c
index a50dc6d408d11c339b38f2436216c8568c4149cf..31f71b15cfbad7aa7cd959d4505644df3dd80b2d 100644
(file)
--- a/
net/ipv4/ip_fragment.c
+++ b/
net/ipv4/ip_fragment.c
@@
-351,7
+351,7
@@
static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
ihl = ip_hdrlen(skb);
/* Determine the position of this fragment. */
ihl = ip_hdrlen(skb);
/* Determine the position of this fragment. */
- end = offset + skb->len - ihl;
+ end = offset + skb->len -
skb_network_offset(skb) -
ihl;
err = -EINVAL;
/* Is this the final fragment? */
err = -EINVAL;
/* Is this the final fragment? */
@@
-381,7
+381,7
@@
static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
goto err;
err = -ENOMEM;
goto err;
err = -ENOMEM;
- if (!pskb_pull(skb, ihl))
+ if (!pskb_pull(skb,
skb_network_offset(skb) +
ihl))
goto err;
err = pskb_trim_rcsum(skb, end - offset);
goto err;
err = pskb_trim_rcsum(skb, end - offset);
@@
-641,6
+641,8
@@
static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
iph->frag_off = 0;
}
iph->frag_off = 0;
}
+ ip_send_check(iph);
+
IP_INC_STATS_BH(net, IPSTATS_MIB_REASMOKS);
qp->q.fragments = NULL;
qp->q.fragments_tail = NULL;
IP_INC_STATS_BH(net, IPSTATS_MIB_REASMOKS);
qp->q.fragments = NULL;
qp->q.fragments_tail = NULL;