Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are a raw update to a vanilla kernel 4.1.10, with the
[kvmfornfv.git]
/
kernel
/
net
/
ipv4
/
ip_fragment.c
diff --git
a/kernel/net/ipv4/ip_fragment.c
b/kernel/net/ipv4/ip_fragment.c
index
cc1da6d
..
cae22a1
100644
(file)
--- a/
kernel/net/ipv4/ip_fragment.c
+++ b/
kernel/net/ipv4/ip_fragment.c
@@
-342,7
+342,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? */
@@
-372,7
+372,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);
@@
-613,6
+613,9
@@
static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,
iph->frag_off = qp->q.max_size ? htons(IP_DF) : 0;
iph->tot_len = htons(len);
iph->tos |= ecn;
iph->frag_off = qp->q.max_size ? htons(IP_DF) : 0;
iph->tot_len = htons(len);
iph->tos |= ecn;
+
+ 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;