Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 3d483058c8c8b87a167155ca9ddd776dd730bc39

Authored by Hannes Frederic Sowa
Committed by Steffen Klassert
1 parent 0ea9d5e3e0
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

ipv6: wire up skb->encapsulation 

When pushing a new header before current one call skb_reset_inner_headers
to record the position of the inner headers in the various ipv6 tunnel
protocols.

We later need this to correctly identify the addresses needed to send
back an error in the xfrm layer.

This change is safe, because skb->protocol is always checked before
dereferencing data from the inner protocol.

Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Cc: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

Showing 3 changed files with 16 additions and 0 deletions Side-by-side Diff

... ... @@ -724,6 +724,11 @@
724 724 ipv6_push_nfrag_opts(skb, &opt.ops, &proto, NULL);
725 725 }
726 726  
  727 + if (likely(!skb->encapsulation)) {
  728 + skb_reset_inner_headers(skb);
  729 + skb->encapsulation = 1;
  730 + }
  731 +
727 732 skb_push(skb, gre_hlen);
728 733 skb_reset_network_header(skb);
729 734 skb_set_transport_header(skb, sizeof(*ipv6h));
net/ipv6/ip6_tunnel.c
Diff comments   View file @ 3d48305
... ... @@ -1027,6 +1027,12 @@
1027 1027 init_tel_txopt(&opt, encap_limit);
1028 1028 ipv6_push_nfrag_opts(skb, &opt.ops, &proto, NULL);
1029 1029 }
  1030 +
  1031 + if (likely(!skb->encapsulation)) {
  1032 + skb_reset_inner_headers(skb);
  1033 + skb->encapsulation = 1;
  1034 + }
  1035 +
1030 1036 skb_push(skb, sizeof(struct ipv6hdr));
1031 1037 skb_reset_network_header(skb);
1032 1038 ipv6h = ipv6_hdr(skb);
... ... @@ -888,6 +888,11 @@
888 888 ttl = iph6->hop_limit;
889 889 tos = INET_ECN_encapsulate(tos, ipv6_get_dsfield(iph6));
890 890  
  891 + if (likely(!skb->encapsulation)) {
  892 + skb_reset_inner_headers(skb);
  893 + skb->encapsulation = 1;
  894 + }
  895 +
891 896 err = iptunnel_xmit(dev_net(dev), rt, skb, fl4.saddr, fl4.daddr,
892 897 IPPROTO_IPV6, tos, ttl, df);
893 898 iptunnel_xmit_stats(err, &dev->stats, dev->tstats);