* [PATCH net v2] ip_tunnel: Set network header properly for IP_ECN_decapsulate()
@ 2014-05-04 5:40 Ying Cai
2014-05-04 15:13 ` Sergei Shtylyov
2014-05-05 23:46 ` Pravin Shelar
0 siblings, 2 replies; 3+ messages in thread
From: Ying Cai @ 2014-05-04 5:40 UTC (permalink / raw)
To: netdev, Neal Cardwell, Eric Dumazet, pshelar
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 eccc1bb8d4b4 ("tunnel: drop packet if ECN present
with not-ECT"). It was only removed from this spot in 3d7b46cd20e3
("ip_tunnel: push generic protocol handling to ip_tunnel module.").
Fixes: 3d7b46cd20e3 ("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>
---
net/ipv4/ip_tunnel.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
index fa5b751..b3f8597 100644
--- a/net/ipv4/ip_tunnel.c
+++ b/net/ipv4/ip_tunnel.c
@@ -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)
--
1.9.1.423.g4596e3a
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net v2] ip_tunnel: Set network header properly for IP_ECN_decapsulate()
2014-05-04 5:40 [PATCH net v2] ip_tunnel: Set network header properly for IP_ECN_decapsulate() Ying Cai
@ 2014-05-04 15:13 ` Sergei Shtylyov
2014-05-05 23:46 ` Pravin Shelar
1 sibling, 0 replies; 3+ messages in thread
From: Sergei Shtylyov @ 2014-05-04 15:13 UTC (permalink / raw)
To: Ying Cai, netdev, Neal Cardwell, Eric Dumazet, pshelar
Hello.
On 04-05-2014 9:40, Ying Cai wrote:
> 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 eccc1bb8d4b4 ("tunnel: drop packet if ECN present
> with not-ECT"). It was only removed from this spot in 3d7b46cd20e3
> ("ip_tunnel: push generic protocol handling to ip_tunnel module.").
> Fixes: 3d7b46cd20e3 ("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>
> ---
> net/ipv4/ip_tunnel.c | 2 ++
> 1 file changed, 2 insertions(+)
> diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
> index fa5b751..b3f8597 100644
> --- a/net/ipv4/ip_tunnel.c
> +++ b/net/ipv4/ip_tunnel.c
> @@ -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)
The path is seriously whitespace-damaged. See
Documentation/email-clients.txt in the kernel tree.
WBR, Sergei
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net v2] ip_tunnel: Set network header properly for IP_ECN_decapsulate()
2014-05-04 5:40 [PATCH net v2] ip_tunnel: Set network header properly for IP_ECN_decapsulate() Ying Cai
2014-05-04 15:13 ` Sergei Shtylyov
@ 2014-05-05 23:46 ` Pravin Shelar
1 sibling, 0 replies; 3+ messages in thread
From: Pravin Shelar @ 2014-05-05 23:46 UTC (permalink / raw)
To: Ying Cai; +Cc: netdev, Neal Cardwell, Eric Dumazet
On Sat, May 3, 2014 at 10:40 PM, Ying Cai <ycai@google.com> wrote:
> 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 eccc1bb8d4b4 ("tunnel: drop packet if ECN present
> with not-ECT"). It was only removed from this spot in 3d7b46cd20e3
> ("ip_tunnel: push generic protocol handling to ip_tunnel module.").
>
> Fixes: 3d7b46cd20e3 ("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: Pravin B Shelar <pshelar@nicira.com>
Looks good. Thanks.
> ---
> net/ipv4/ip_tunnel.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c
> index fa5b751..b3f8597 100644
> --- a/net/ipv4/ip_tunnel.c
> +++ b/net/ipv4/ip_tunnel.c
> @@ -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)
> --
> 1.9.1.423.g4596e3a
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-05-05 23:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-04 5:40 [PATCH net v2] ip_tunnel: Set network header properly for IP_ECN_decapsulate() Ying Cai
2014-05-04 15:13 ` Sergei Shtylyov
2014-05-05 23:46 ` Pravin Shelar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).