From patchwork Fri Apr 19 00:45:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Schaufler X-Patchwork-Id: 10908375 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5AF231515 for ; Fri, 19 Apr 2019 00:47:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4598C28B1F for ; Fri, 19 Apr 2019 00:47:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 39A8928B9D; Fri, 19 Apr 2019 00:47:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5EAF28B1F for ; Fri, 19 Apr 2019 00:47:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726841AbfDSAr3 (ORCPT ); Thu, 18 Apr 2019 20:47:29 -0400 Received: from sonic317-33.consmr.mail.bf2.yahoo.com ([74.6.129.88]:39274 "EHLO sonic317-33.consmr.mail.bf2.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726835AbfDSAr3 (ORCPT ); Thu, 18 Apr 2019 20:47:29 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1555634848; bh=n7o8QGFhmUAYfuuVtS2cjj7dSkuQxOxyGbWYP+SBOLg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject; b=bWVVU8Byzt1gLZXJMCCZZDZyFeJlrFBfE7uqJtbnUUtG/sCd46KmavmSIPdkHxlBx2FISAX3os0PyLOY9gowCciXhyEHvYiXr36hvJJ7rcONdXqzPEch5XOx/Giqai8akY+HcDQthLQS9AhlWuRiL0/UbVdUUwOiF48IXlEUV+LAaA8YtAK/AhpEhd8DCT98Ldy2ebOYqrKTKwBrPO4UxHqHRLU6tmrGr64hyjJlQXkGuMs96FH2+ilVpOsDz9ZAB5zi3+Gq1kcFPDU1dcEEhjEOPoeqqcRh8kUubnR+akpOI6xJwKKhKEBPXf88LbhYutHETdrke7hk2JKLFQI0IA== X-YMail-OSG: TnmnKLEVM1kRQPkMQLuqcQNomygn28zBmJqR_oqqecfEAVougFHyET5.t7IGhiF 8l4rRS0CoWnFQ03bMqfH32tFmymp1yq4MlLNqS.zegHxLFNAhcUAy.9.1GxLVo_EVDWpD4QNyWW3 8D1n2ZHrbknqVO4CuhGzxOs0ElkcKyz0jhTYJadq.VDCeTvuKgDYZ9bz7DtzKhP5DrWZmciLdUG3 C3rWJvwAXRN9OnlXx3jsG8j.PbKAKnMUGUqr9jfsxgcID2am7qdRPfzyuu_lLu15E5q_RuqIOorU 2bXJ8yKDtJ1y.HTPK1IQuorBKmT5sKchwcg9MkLBQONkHrH3q3vZhESJMBt04g7UNmigUfIFsOwU xqGkCZS9kUcx18cOKeylc5sAkKv5efd4D95meD6Mu1pORVwwjL5xQaQGXN7ubUnLMJr56na.N1BF wNktooGzZRmks9150TXFLrmut7Jpu.rFJcCyzenCESyDXBQQt4eD8WjP5ORF0SlKgGGtiITkOj0o IffSv3W4ppysYrz7Eal1q95hK__152JZ5WWtq8YjDjnL7LcDlj5uaMvQ3L11jiC4yvE7gr2NiUqh AqOD3TUOl5QKZ15GpVjNAyWC884ibbTjB1yjvYuXWnazv6.XglktEyUizaEiKXGwVFasmW8V8BlJ Hj2cTkjVNJ5Pnn_kAa.qs3Mw2nKL8n6pnlZEVVGZg0L0jBXwEjlU08IEy5yUrw1qV4RXcFDsMiaJ pcrMHt.jZ8W4CPhV5GQUi_RzDYKOYa9doel2Qz5AHNY2M6liKlaomeIE9ilrg2RpaBYiNhwX9QAK 8jRCzBg2ovom1pn7ewEtgKIf1b81xfp4jURM0EXah.PXq_fx.O4XSe2HGtbgNxHwu2rjJ..aqWvp wY6DMPO.W0to3qMg0Xke0_YuO_pBHYbO_WygMBBZxCMn2CXf.X4UPnXmRl8M6XhDKStYhMFptv10 Y.ODuHI0gLQCtjblSH0BM74xzAeWUaDmnTSYy6r4I63.hYiCDV53XB2wGH2fzO11SmcFTv3e_S9u bwpxwQ3mDD.Fl15nqDznhE0GvSyr5NjkqAeF3xUd9h_9ykZBx9MQ17IE.kYCS.fNDmHooHTRVgAb Szt8DQSvuwAJb9.TtqScDeML1rqo1V.44oWfufNsAtvrL.ZO0h0JFsAYTG_7SRaTR1EVAnmXKHQQ 5ePZZvNoeoL.n Received: from sonic.gate.mail.ne1.yahoo.com by sonic317.consmr.mail.bf2.yahoo.com with HTTP; Fri, 19 Apr 2019 00:47:28 +0000 Received: from c-67-169-65-224.hsd1.ca.comcast.net (EHLO localhost.localdomain) ([67.169.65.224]) by smtp428.mail.bf1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 5d780a730ba98836fa707a31546db6ad; Fri, 19 Apr 2019 00:47:25 +0000 (UTC) From: Casey Schaufler To: casey.schaufler@intel.com, jmorris@namei.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org Cc: casey@schaufler-ca.com Subject: [PATCH 29/90] NET: Remove scaffolding on new secmarks Date: Thu, 18 Apr 2019 17:45:16 -0700 Message-Id: <20190419004617.64627-30-casey@schaufler-ca.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20190419004617.64627-1-casey@schaufler-ca.com> References: <20190419004617.64627-1-casey@schaufler-ca.com> Sender: selinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Replace the lsm_export scaffolding in nft_meta. Signed-off-by: Casey Schaufler --- net/netfilter/nft_meta.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/net/netfilter/nft_meta.c b/net/netfilter/nft_meta.c index 598bea8e4799..a1d3dab5bc25 100644 --- a/net/netfilter/nft_meta.c +++ b/net/netfilter/nft_meta.c @@ -580,11 +580,17 @@ static int nft_secmark_compute_secid(struct nft_secmark *priv) u32 tmp_secid = 0; int err; + lsm_export_init(&le); err = security_secctx_to_secid(priv->ctx, strlen(priv->ctx), &le); if (err) return err; - lsm_export_secid(&le, &tmp_secid); + /* Use the "best" secid */ + if (le.selinux) + tmp_secid = le.selinux; + else + tmp_secid = le.smack; + if (!tmp_secid) return -ENOENT;