From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752171AbbDZNkr (ORCPT ); Sun, 26 Apr 2015 09:40:47 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:40458 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751926AbbDZNke (ORCPT ); Sun, 26 Apr 2015 09:40:34 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Herbert Xu , "David S. Miller" Subject: [PATCH 4.0 5/7] Revert "net: Reset secmark when scrubbing packet" Date: Sun, 26 Apr 2015 15:40:04 +0200 Message-Id: <20150426120018.972536006@linuxfoundation.org> X-Mailer: git-send-email 2.3.6 In-Reply-To: <20150426120018.032351371@linuxfoundation.org> References: <20150426120018.032351371@linuxfoundation.org> User-Agent: quilt/0.64 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Herbert Xu [ 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 Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/core/skbuff.c | 1 - 1 file changed, 1 deletion(-) --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4178,7 +4178,6 @@ void skb_scrub_packet(struct sk_buff *sk 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);