Messages in this thread Patch in this message | | | From | Greg Kroah-Hartman <> | Subject | [PATCH 3.19 16/27] Revert "net: Reset secmark when scrubbing packet" | Date | Sun, 26 Apr 2015 16:15:47 +0200 |
| |
3.19-stable review patch. If anyone has any objections, please let me know.
------------------
From: Herbert Xu <herbert@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 <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 | 1 - 1 file changed, 1 deletion(-)
--- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4149,7 +4149,6 @@ void skb_scrub_packet(struct sk_buff *sk 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);
| |