diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-04-16 16:12:53 +0800 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-04-27 16:48:31 -0400 |
| commit | efca6fa3f967cdadda3da28eb049df8291a7e85e (patch) | |
| tree | b663c00f13b46ce56d671d4ecdb1550e0a7c5070 /net/core/skbuff.c | |
| parent | 6ee16f4a033f21a9a41d60a8d93f9663ec269913 (diff) | |
| download | lwn-efca6fa3f967cdadda3da28eb049df8291a7e85e.tar.gz lwn-efca6fa3f967cdadda3da28eb049df8291a7e85e.zip | |
Revert "net: Reset secmark when scrubbing packet"
[ Upstream commit 4c0ee414e877b899f7fc80aafb98d9425c02797f ]
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>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
Diffstat (limited to 'net/core/skbuff.c')
| -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 79589ae84a5d..425c539e70b1 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4041,7 +4041,6 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet) skb->ignore_df = 0; skb_dst_drop(skb); skb->mark = 0; - skb_init_secmark(skb); secpath_reset(skb); nf_reset(skb); nf_reset_trace(skb); |