Commit efca6fa3 authored Apr 16, 2015 by Herbert Xu Committed by Sasha Levin Apr 27, 2015

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>

parent 6ee16f4a

net/core/skbuff.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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);