When ip_frag_queue() computes positions, it assumes that the passed
sk_buff does not contain L2 headers. However, when
PACKET_FANOUT_FLAG_DEFRAG is used, IP defragmentation functions can be
called on outgoing packets that contain L2 headers. Also, IPv4
checksum is not corrected after defragmentation.
Fixes: 7736d33f4262 (packet: Add pre-defragmentation support for ipv4
fanouts.)
Signed-off-by: Edward Hyunkoo Jee ed...@google.com
Acked-by: Eric Dumazet eduma...@google.com
Cc: Willem de Bruijn will...@google.com
Cc: Jerry Chu hk...@google.com
---
net/ipv4/ip_fragment.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
index a50dc6d..44c8f2a 100644
--- 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. */
- end = offset + skb-len - ihl;
+ end = offset + skb-len - skb_network_offset(skb) - ihl;
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;
- if (!pskb_pull(skb, ihl))
+ if (!pskb_pull(skb, skb_network_offset(skb) + ihl))
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;
}
+ ip_send_check(ip_hdr(skb));
+
IP_INC_STATS_BH(net, IPSTATS_MIB_REASMOKS);
qp-q.fragments = NULL;
qp-q.fragments_tail = NULL;
--
2.4.3.573.g4eafbef
--
To unsubscribe from this list: send the line unsubscribe netdev in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
