4.0-stable review patch. If anyone has any objections, please let me know.
------------------ From: Herbert Xu <herb...@gondor.apana.org.au> [ 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 <herb...@gondor.apana.org.au> Signed-off-by: David S. Miller <da...@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- net/core/skbuff.c | 1 - 1 file changed, 1 deletion(-) --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4178,7 +4178,6 @@ void skb_scrub_packet(struct sk_buff *sk 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); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/