diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-04-16 16:12:53 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-04-29 10:23:43 +0200 |
| commit | 5fe5245de99b6842fe4b22cc98fae6c2e95eebad (patch) | |
| tree | ebdb573fa489aca7cc72d48d0dd6b93a0fb1437f | |
| parent | e366600224bfc2beda6ab595443f84e3dbbae673 (diff) | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -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 62c67bebcaf5..b11e8f93167b 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4149,7 +4149,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); |