From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 16 Apr 2015 08:12:53 +0000 (+0800)
Subject: Revert "net: Reset secmark when scrubbing packet"
X-Git-Tag: v3.18.13~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efca6fa3f967cdadda3da28eb049df8291a7e85e;p=thirdparty%2Fkernel%2Fstable.git

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>
---

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 79589ae84a5d2..425c539e70b1b 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);