Skip to content

Commit fe63339

Browse files
wdebruijdavem330
authored andcommitted
ip6_gre: Revert "ip6_gre: add validation for csum_start"
This reverts commit 9cf448c. This commit was added for equivalence with a similar fix to ip_gre. That fix proved to have a bug. Upon closer inspection, ip6_gre is not susceptible to the original bug. So revert the unnecessary extra check. In short, ipgre_xmit calls skb_pull to remove ipv4 headers previously inserted by dev_hard_header. ip6gre_tunnel_xmit does not. Link: https://lore.kernel.org/netdev/CA+FuTSe+vJgTVLc9SojGuN-f9YQ+xWLPKE_S4f=f+w+_P2hgUg@mail.gmail.com/#t Fixes: 9cf448c ("ip6_gre: add validation for csum_start") Signed-off-by: Willem de Bruijn <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 0c03839 commit fe63339

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

net/ipv6/ip6_gre.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -629,8 +629,6 @@ static int gre_rcv(struct sk_buff *skb)
629629

630630
static int gre_handle_offloads(struct sk_buff *skb, bool csum)
631631
{
632-
if (csum && skb_checksum_start(skb) < skb->data)
633-
return -EINVAL;
634632
return iptunnel_handle_offloads(skb,
635633
csum ? SKB_GSO_GRE_CSUM : SKB_GSO_GRE);
636634
}

0 commit comments

Comments
 (0)