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>

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 3b6e5830256ec9e38399729cd352ee3735441198..f9800f4059b43f7e74d2741a0d3885c5a9efb787 100644 (file)
--- 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);