Merge tag 'selinux-pr-20181129' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / net / core / skbuff.c

diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index b4ee5c8b928f07879b3c7ed08ed5e9b67b08fcb4..a8217e221e1954871f15d6ba160538939d9b53ff 100644 (file)
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -4854,6 +4854,11 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet)
        nf_reset(skb);
        nf_reset_trace(skb);
 
+#ifdef CONFIG_NET_SWITCHDEV
+       skb->offload_fwd_mark = 0;
+       skb->offload_mr_fwd_mark = 0;
+#endif
+
        if (!xnet)
                return;