Skip to content

Commit

Permalink
ip_tunnel: Set network header properly for IP_ECN_decapsulate()
Browse files Browse the repository at this point in the history
In ip_tunnel_rcv(), set skb->network_header to inner IP header
before IP_ECN_decapsulate().

Without the fix, IP_ECN_decapsulate() takes outer IP header as
inner IP header, possibly causing error messages or packet drops.

Note that this skb_reset_network_header() call was in this spot when
the original feature for checking consistency of ECN bits through
tunnels was added in eccc1bb ("tunnel: drop packet if ECN present
with not-ECT"). It was only removed from this spot in 3d7b46c
("ip_tunnel: push generic protocol handling to ip_tunnel module.").

Fixes: 3d7b46c ("ip_tunnel: push generic protocol handling to ip_tunnel module.")
Reported-by: Neal Cardwell <ncardwell@google.com>
Signed-off-by: Ying Cai <ycai@google.com>
Acked-by: Neal Cardwell <ncardwell@google.com>
Acked-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ying Cai authored and David S. Miller committed May 5, 2014
1 parent 780ce3a commit e96f2e7
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions net/ipv4/ip_tunnel.c
Original file line number Diff line number Diff line change
Expand Up @@ -442,6 +442,8 @@ int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff *skb,
tunnel->i_seqno = ntohl(tpi->seq) + 1;
}

skb_reset_network_header(skb);

err = IP_ECN_decapsulate(iph, skb);
if (unlikely(err)) {
if (log_ecn_error)
Expand Down

0 comments on commit e96f2e7

Please sign in to comment.