Skip to content

Commit

Permalink
Revert "net: Reset secmark when scrubbing packet"
Browse files Browse the repository at this point in the history
This patch reverts commit b8fb4e0
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>
  • Loading branch information
Herbert Xu authored and David S. Miller committed Apr 16, 2015
1 parent 725f9dc commit 4c0ee41
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion net/core/skbuff.c
Original file line number Diff line number Diff line change
Expand Up @@ -4133,7 +4133,6 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet)
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);
Expand Down

0 comments on commit 4c0ee41

Please sign in to comment.