Commit 5fe5245d authored by Herbert Xu's avatar Herbert Xu Committed by Greg Kroah-Hartman

Revert "net: Reset secmark when scrubbing packet"

[ Upstream commit 4c0ee414 ]

This patch reverts commit b8fb4e06
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: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e3666002
...@@ -4149,7 +4149,6 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet) ...@@ -4149,7 +4149,6 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet)
skb->ignore_df = 0; skb->ignore_df = 0;
skb_dst_drop(skb); skb_dst_drop(skb);
skb->mark = 0; skb->mark = 0;
skb_init_secmark(skb);
secpath_reset(skb); secpath_reset(skb);
nf_reset(skb); nf_reset(skb);
nf_reset_trace(skb); nf_reset_trace(skb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment