Revert "net: Reset secmark when scrubbing packet"
authorHerbert Xu <herbert@gondor.apana.org.au>
Thu, 16 Apr 2015 08:12:53 +0000 (16:12 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Apr 2015 08:23:43 +0000 (10:23 +0200)
commit5fe5245de99b6842fe4b22cc98fae6c2e95eebad
treeebdb573fa489aca7cc72d48d0dd6b93a0fb1437f
parente366600224bfc2beda6ab595443f84e3dbbae673
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>
net/core/skbuff.c