diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-04-16 10:12:53 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-04-16 20:19:02 +0200 |
| commit | 4c0ee414e877b899f7fc80aafb98d9425c02797f (patch) | |
| tree | e26eafcb6e5c0f73b5f8d24f11f12a4f06439fa7 /net/core | |
| parent | bpf: fix two bugs in verification logic when accessing 'ctx' pointer (diff) | |
| download | linux-4c0ee414e877b899f7fc80aafb98d9425c02797f.tar.xz linux-4c0ee414e877b899f7fc80aafb98d9425c02797f.zip | |
Revert "net: Reset secmark when scrubbing packet"
This patch reverts commit b8fb4e0648a2ab3734140342002f68fb0c7d1602
because the secmark must be preserved even when a packet crosses
namespace boundaries. The reason is that security labels apply to
the system as a whole and is not per-namespace.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/skbuff.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 3b6e5830256e..f9800f4059b4 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4133,7 +4133,6 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet) skb_dst_drop(skb); skb->mark = 0; skb_sender_cpu_clear(skb); - skb_init_secmark(skb); secpath_reset(skb); nf_reset(skb); nf_reset_trace(skb); |