Skip to content

Commit

Permalink
seg6: fix skb transport_header after decap_and_validate()
Browse files Browse the repository at this point in the history
in the receive path (more precisely in ip6_rcv_core()) the
skb->transport_header is set to skb->network_header + sizeof(*hdr). As a
consequence, after routing operations, destination input expects to find
skb->transport_header correctly set to the next protocol (or extension
header) that follows the network protocol. However, decap behaviors (DX*,
DT*) remove the outer IPv6 and SRH extension and do not set again the
skb->transport_header pointer correctly. For this reason, the patch sets
the skb->transport_header to the skb->network_header + sizeof(hdr) in each
DX* and DT* behavior.

Signed-off-by: Andrea Mayer <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
skorpion17 authored and davem330 committed Nov 16, 2019
1 parent 7f91ed8 commit c71644d
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions net/ipv6/seg6_local.c
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,8 @@ static int input_action_end_dx6(struct sk_buff *skb,
if (!ipv6_addr_any(&slwt->nh6))
nhaddr = &slwt->nh6;

skb_set_transport_header(skb, sizeof(struct ipv6hdr));

seg6_lookup_nexthop(skb, nhaddr, 0);

return dst_input(skb);
Expand Down Expand Up @@ -370,6 +372,8 @@ static int input_action_end_dx4(struct sk_buff *skb,

skb_dst_drop(skb);

skb_set_transport_header(skb, sizeof(struct iphdr));

err = ip_route_input(skb, nhaddr, iph->saddr, 0, skb->dev);
if (err)
goto drop;
Expand All @@ -390,6 +394,8 @@ static int input_action_end_dt6(struct sk_buff *skb,
if (!pskb_may_pull(skb, sizeof(struct ipv6hdr)))
goto drop;

skb_set_transport_header(skb, sizeof(struct ipv6hdr));

seg6_lookup_nexthop(skb, NULL, slwt->table);

return dst_input(skb);
Expand Down

0 comments on commit c71644d

Please sign in to comment.