From: David Miller <davem@davemloft.net>
To: tgraf@suug.ch
Cc: herbert@gondor.apana.org.au, nicolas.dichtel@6wind.com,
netdev@vger.kernel.org, ebiederm@xmission.com, jmorris@namei.org,
linux-security-module@vger.kernel.org
Subject: Re: [v3] skbuff: Do not scrub skb mark within the same name space
Date: Thu, 16 Apr 2015 14:21:24 -0400 (EDT) [thread overview]
Message-ID: <20150416.142124.1721494984301782904.davem@davemloft.net> (raw)
In-Reply-To: <20150416083335.GE32170@casper.infradead.org>
From: Thomas Graf <tgraf@suug.ch>
Date: Thu, 16 Apr 2015 09:33:35 +0100
> On 04/16/15 at 09:03am, Herbert Xu wrote:
>> The commit ea23192e8e577dfc51e0f4fc5ca113af334edff9 ("tunnels:
>> harmonize cleanup done on skb on rx path") broke anyone trying to
>> use netfilter marking across IPv4 tunnels. While most of the
>> fields that are cleared by skb_scrub_packet don't matter, the
>> netfilter mark must be preserved.
>>
>> This patch rearranges skb_scrub_packet to preserve the mark field.
>>
>> Fixes: ea23192e8e57 ("tunnels: harmonize cleanup done on skb on rx path")
>> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
>
> Acked-by: Thomas Graf <tgraf@suug.ch>
>
> We should also add a flag to veth which expclitly allows to preserve
> the mark into the namespace.
Applied and queued up for -stable, thanks.
prev parent reply other threads:[~2015-04-16 18:21 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-15 10:01 ip_tunnel: Remove gratuitous skb scrubbing Herbert Xu
2015-04-15 10:13 ` 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 [this message]
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=20150416.142124.1721494984301782904.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=ebiederm@xmission.com \
--cc=herbert@gondor.apana.org.au \
--cc=jmorris@namei.org \
--cc=linux-security-module@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nicolas.dichtel@6wind.com \
--cc=tgraf@suug.ch \
/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 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).