Commit 02948c19 authored by Edward Hyunkoo Jee's avatar Edward Hyunkoo Jee Committed by Sasha Levin

inet: frags: fix defragmented packet's IP header for af_packet

[ Upstream commit 0848f642 ]

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 reassembly
functions can be called on outgoing packets that contain L2 headers.

Also, IPv4 checksum is not corrected after reassembly.

Fixes: 7736d33f ("packet: Add pre-defragmentation support for ipv4 fanouts.")
Signed-off-by: default avatarEdward Hyunkoo Jee <edjee@google.com>
Signed-off-by: default avatarEric Dumazet <edumazet@google.com>
Cc: Willem de Bruijn <willemb@google.com>
Cc: Jerry Chu <hkchu@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 13e4ceb7
...@@ -342,7 +342,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb) ...@@ -342,7 +342,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
ihl = ip_hdrlen(skb); ihl = ip_hdrlen(skb);
/* Determine the position of this fragment. */ /* Determine the position of this fragment. */
end = offset + skb->len - ihl; end = offset + skb->len - skb_network_offset(skb) - ihl;
err = -EINVAL; err = -EINVAL;
/* Is this the final fragment? */ /* Is this the final fragment? */
...@@ -372,7 +372,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb) ...@@ -372,7 +372,7 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
goto err; goto err;
err = -ENOMEM; err = -ENOMEM;
if (pskb_pull(skb, ihl) == NULL) if (!pskb_pull(skb, skb_network_offset(skb) + ihl))
goto err; goto err;
err = pskb_trim_rcsum(skb, end - offset); err = pskb_trim_rcsum(skb, end - offset);
...@@ -612,6 +612,9 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev, ...@@ -612,6 +612,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->frag_off = qp->q.max_size ? htons(IP_DF) : 0;
iph->tot_len = htons(len); iph->tot_len = htons(len);
iph->tos |= ecn; iph->tos |= ecn;
ip_send_check(iph);
IP_INC_STATS_BH(net, IPSTATS_MIB_REASMOKS); IP_INC_STATS_BH(net, IPSTATS_MIB_REASMOKS);
qp->q.fragments = NULL; qp->q.fragments = NULL;
qp->q.fragments_tail = NULL; qp->q.fragments_tail = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment