]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
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:22:18 +0000 (10:22 +0200)
commitd44d12638229b1fea88dbecc28eee7c7a8188eb8
tree6a9a0f09be336dd18c6a67b8c2a66e80512c040e
parent32a08be658b2b801260b84323ac8bd9cbecae811
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