All of lore.kernel.org
 help / color / mirror / Atom feed
From: Herbert Xu <herbert@gondor.apana.org.au>
To: netdev@vger.kernel.org, Nicolas Dichtel <nicolas.dichtel@6wind.com>
Subject: ip_tunnel: Remove gratuitous skb scrubbing
Date: Wed, 15 Apr 2015 18:01:07 +0800	[thread overview]
Message-ID: <20150415100107.GA3655@gondor.apana.org.au> (raw)

The commit ea23192e8e577dfc51e0f4fc5ca113af334edff9 ("tunnels:
harmonize cleanup done on skb on rx path") broke anyone trying to
use netfilter marking across IPv4 tunnels.  As the commit message
did not give any justification for this (in fact it shouldn't
even be touching the tx path), I can only assume that it was a typo.

This patch reverts that change.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c
index 88c386c..709e711 100644
--- a/net/ipv4/ip_tunnel_core.c
+++ b/net/ipv4/ip_tunnel_core.c
@@ -54,7 +54,8 @@ int iptunnel_xmit(struct sock *sk, struct rtable *rt, struct sk_buff *skb,
 	struct iphdr *iph;
 	int err;
 
-	skb_scrub_packet(skb, xnet);
+	if (xnet)
+		skb_scrub_packet(skb, true);
 
 	skb_clear_hash(skb);
 	skb_dst_set(skb, &rt->dst);
-- 
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt

             reply	other threads:[~2015-04-15 10:01 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-15 10:01 Herbert Xu [this message]
2015-04-15 10:13 ` ip_tunnel: Remove gratuitous skb scrubbing Herbert Xu
2015-04-15 10:20 ` Nicolas Dichtel
2015-04-15 10:22   ` Herbert Xu
2015-04-15 10:28     ` Nicolas Dichtel
2015-04-15 10:32       ` Herbert Xu
2015-04-15 13:57     ` Herbert Xu
2015-04-15 15:41       ` Nicolas Dichtel
2015-04-16  1:03         ` [v3] skbuff: Do not scrub skb mark within the same name space Herbert Xu
2015-04-16  7:02           ` James Morris
2015-04-16  7:35             ` Nicolas Dichtel
2015-04-16  7:59               ` Herbert Xu
2015-04-16  8:12             ` Revert "net: Reset secmark when scrubbing packet" Herbert Xu
2015-04-16  8:32               ` Thomas Graf
2015-04-16 18:21               ` David Miller
2015-04-16  8:33           ` [v3] skbuff: Do not scrub skb mark within the same name space Thomas Graf
2015-04-16 18:21             ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150415100107.GA3655@gondor.apana.org.au \
    --to=herbert@gondor.apana.org.au \
    --cc=netdev@vger.kernel.org \
    --cc=nicolas.dichtel@6wind.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.