From patchwork Sun Jun 2 16:50:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Schaufler X-Patchwork-Id: 10971905 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 DE06B18A6 for ; Sun, 2 Jun 2019 16:52:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF800286E4 for ; Sun, 2 Jun 2019 16:52:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C39E328A00; Sun, 2 Jun 2019 16:52:56 +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=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=unavailable 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 85C94286E4 for ; Sun, 2 Jun 2019 16:52:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726998AbfFBQwz (ORCPT ); Sun, 2 Jun 2019 12:52:55 -0400 Received: from sonic317-38.consmr.mail.ne1.yahoo.com ([66.163.184.49]:34889 "EHLO sonic317-38.consmr.mail.ne1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726993AbfFBQwz (ORCPT ); Sun, 2 Jun 2019 12:52:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1559494374; bh=n7o8QGFhmUAYfuuVtS2cjj7dSkuQxOxyGbWYP+SBOLg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject; b=n48gwVeFVX0n5/5KntUUwoFVWUsMxXga8a+2JtqaRqdvOKqyKVNck5raEp1VvxrLJDcsLODXX9vBdj2JzDnisoRW6uRPs3Ki397Sy2BujqeV4/qJ3AibZcP7BMJCmwNJrg+qERcx7La/oz08LKYbxBEXEqnIauxmQ2SDwpofDn8wXXGViUXCYpcYx5fvS5vfpcImVBNyfZgGXQWQEnyKhNc6NIzhKe+8r2aDiVsXui8M3XG/AeR9fRwMzRBx9whVqt46UTCyP8b5Urvmy3m9UMiuzPmJ1ZI6tpNNw8Akw+rFm5ZSVY7J91sN0fZoXgN9rFLii9eZzU73SpcSwl3obg== X-YMail-OSG: pC9PScEVM1l8CwjVfEZ6.ngDIJGDhn3wBv8aBW2lCEP4TWSALaHPgZzQ0pRSUXB Uh_Wc8JAtxPQ.FCGZvPM.6dqEAZM5_2kgBigmZXG0wJapUMhP_BmLunbqgRzMisezEmhS_Ci3mw4 ATUTLb4juKqWql_6t6GW.Z5z_iZdWbin_xtOQi3oYP1HUwyC4soO0XmFIZprXCXjx0CkEFH6fvxt Tp0.OcuR.p1UaGUlIeF2DHJoHTxWYJoCR3Jnmwmeqfq3V3dYQBfYb7ySKQSnfhoaKV3Eww.yM12I anZWCqKJImnOtkl322Eu9OiGnE2gz8yHGe7jvYikTmvCs63kPm7DRT75PQlkAnZ_FZf8NXzYLxui bC8bMWW7ZDGDJw3JUuxo2Kksgl19iX_vb5s_gvdjCi5zdkrj7GPQ01Nbyqdm8obGSBubRbWWJirM TRIX.pGs1P6eHvg0xv0lpl0TSTDlA9oIP_iVg79rbPY_SykUwjIuu7jVg9pBwT3vxRnP2UDXPqDt dy5SaUcPwf1OS.Kty7VBGo3HSZqDb8FMGeVbbZXvuRNECsh0zp.VBzFt1h.Jm6SOy.NQsGvhVAz8 xxwY9xdFEwHul677l2zFWG9.m0Iw1qTVQ_wKglLTvOWZsNqbDzYlkcLS4Tf2RAqlOgnGvOulj1ER balhPz66p8M5romoRtJvdHm_VcrfA93l2zO5GVDNn_j7Mj607.gs40DGHAANZZrdoU6FxFj1cZls Hbqqso7IOW5rbiDMQiCouTaqpkCBfyw3Uy5E_cRou.o2m1kN_Ks2qJY8OiYwWOX3SPiQy2XXb7_O OVUuTt_XmfsOT2tU5ZB7ctvng82Ut9utobgijtsJ0UZd__Dpdgq1HaCwN53xvi0UkNKhxuqtsCmH MdF5S9SxslKNo.wkxFNBzfNs7D0ecxc7oan6BlwrPsTmA0JxS2CtklUOHrgj.Alcvw9QqKOTAHhY QMQUrKejXouO1.tdUlKx4zeu18mWl0yYQYppXNiK4K5lbE1hVw9wYW_Rh8B8O5xB3BXl6iCc302M suBQaAlm912e2M3RXGLE1CuJfjZQMs5nz4.yNBjhmS_EVOSVdveO1gGPUYqx0XpKffhB_ggxtu2a BtCu5K2fjytUKSTDpqfVBoNpKCxURGar5.ny.J4fCJSZlehdNQn.w.Kqeg5jbDmsMc6Bl4CtgjxA 0kpdNZ0BMXCCPytRK7Sj1M0AAp._CMd9GrDdHyGLDbOlwHk3O_YKZFp9rZidnXbDNybz7MCi20KG msWwAaI_li46OWPKaNMwhO..4rYGFR1kOiu3lcmumg3roTOyrYOiR Received: from sonic.gate.mail.ne1.yahoo.com by sonic317.consmr.mail.ne1.yahoo.com with HTTP; Sun, 2 Jun 2019 16:52:54 +0000 Received: from c-73-223-4-185.hsd1.ca.comcast.net (EHLO localhost.net) ([73.223.4.185]) by smtp409.mail.ne1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 0c0e3da8255eb26ca342a489fa1b8a19; Sun, 02 Jun 2019 16:52:51 +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, keescook@chromium.org, john.johansen@canonical.com, penguin-kernel@i-love.sakura.ne.jp, paul@paul-moore.com, sds@tycho.nsa.gov Subject: [PATCH 28/58] NET: Remove scaffolding on new secmarks Date: Sun, 2 Jun 2019 09:50:31 -0700 Message-Id: <20190602165101.25079-29-casey@schaufler-ca.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190602165101.25079-1-casey@schaufler-ca.com> References: <20190602165101.25079-1-casey@schaufler-ca.com> MIME-Version: 1.0 Sender: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: 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;