From: Thomas Graf <tgraf@suug.ch>
Date: Tue, 23 Dec 2014 00:13:18 +0000 (+0100)
Subject: net: Reset secmark when scrubbing packet
X-Git-Tag: v3.16.35~3086
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a6dd222200202728ca591ea4bbe7ba78caf740ae;p=thirdparty%2Fkernel%2Fstable.git

net: Reset secmark when scrubbing packet

commit b8fb4e0648a2ab3734140342002f68fb0c7d1602 upstream.

skb_scrub_packet() is called when a packet switches between a context
such as between underlay and overlay, between namespaces, or between
L3 subnets.

While we already scrub the packet mark, connection tracking entry,
and cached destination, the security mark/context is left intact.

It seems wrong to inherit the security context of a packet when going
from overlay to underlay or across forwarding paths.

Signed-off-by: Thomas Graf <tgraf@suug.ch>
Acked-by: Flavio Leitner <fbl@sysclose.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index f5f14d54d6a26..fe07faaed2561 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -3933,6 +3933,7 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet)
 	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);