From patchwork Tue Apr 9 19:18:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Casey Schaufler X-Patchwork-Id: 10892087 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 4386A1390 for ; Tue, 9 Apr 2019 19:19:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3675F288B3 for ; Tue, 9 Apr 2019 19:19:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B0CC28938; Tue, 9 Apr 2019 19:19:22 +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 D2621288B3 for ; Tue, 9 Apr 2019 19:19:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726828AbfDITTU (ORCPT ); Tue, 9 Apr 2019 15:19:20 -0400 Received: from sonic313-26.consmr.mail.gq1.yahoo.com ([98.137.65.89]:36503 "EHLO sonic313-26.consmr.mail.gq1.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726761AbfDITTP (ORCPT ); Tue, 9 Apr 2019 15:19:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1554837555; bh=n7o8QGFhmUAYfuuVtS2cjj7dSkuQxOxyGbWYP+SBOLg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From:Subject; b=ftgsKBJDlSA7vkxZDHM6QPTCuIIP7eGCHvBnZyul8Hpw6mmYAgYLN/ocvo98DVGGXLz9dD4d+YvbZdgcPMExm/j5qaN3tW+zy1mAefRlIsRAI1eQi7DXISRIJHXVtEi+V3mmN0iIhaH6AqyPejcJewpTAh1SGrRPQXxsw28JCC7aSmBXX4aI7XcO4DrvERq2VvQ6Z66Nn36DRAksNyQAUxBXqgSWz+Wpk19jQRbO4oJdQuDXoir9F4mgH2cw3zvBNg/Z2MBpAD9qIxR5QIlajG6JTFZAti3vFS4U0MGuoBnQAAf0GoTgT6EVgK6tzJDqMxWVqDHpbia3oR5AiyVP8g== X-YMail-OSG: WnHKRRsVM1nHavz8TTySgZ2KOMN3wr85pwvQ9DOn652z34CxPt1kxa5x5KgfqYw _Bl4fMcMCRjJjq9U4DEL_87p0nOKMm4WksoR8ICKlUKgw0WUn_icyeCMAkT_q.3qv45RtqfUNcdt Xx2zS6W9u1CPrgaMLBaELznrS9.DrRpeFzUizoHFdLnVXcc0e_L.VYB6fH4PWd6TnTMRMAgVsTIs j9CsbEXrD.D5aceizsrEsqqfyG07HKoKHS_13XqYt064EmlavAu.lPax6geQ9ZrOS4z67Z1vA.ok qNyCsorLwGXNN4eO40HvlWMOVaa2SIgmpSWc9L3QjaKbxYhBLidb1IAwrsIwn3EccRxmOC91eFqG J8wzuNn232UjxlnfM_VdwzlvWgtYdAaDOEu_lF1M_o9s6BBnVU_MY7Bp38LnHwhbKInncro7GYNf hHfDA0t6qDhHiXt80fjGdRmvRmEGVWOzVs829QPbHSAUFksuUUw4KtkeunLZkCJg5PgbeYp2fFHJ 6bKeuPhhFMyytBRJTtQdyDyD._596MMHOJ29gQkx1x1PJPFWH_P.2Ggef7rCnTiA2dOn3c5W4y1O I.oG4vPUYTCwxCsnbqlko2AphEKFptipdISZ4j91VWcWPSc3GQpdRfsZx68NdgVFeiEXI_EGZBfP 95prCccrl4ugQtis_eg6_g8VSugP7dGIt9aEJy73paSbhUC1VKu17fCA0o2k9uSdeEMOqRCBaJeJ w0s8fcG4pK78fBX8gq1PlCDxKgGilkXxZfPH8XfuB6Qc4UfmBX4c0UbSw9aC2HyouNhfN6DSxNAf ZquF7liWDplF5SnSCcEj7RF403H9aI6u6NcZpvXqsiLG7L1GbD6LIDABsDQDZkQSNm0yChO3.Hfb an7jzkmYmj4IDpZHBVpeSdIWX1Y0DtOnMkA8boPqtlIp7CncdDh9uPhttm9pYRmGtKZi1sETXtmc XKR4wg3YMYe7Jogg6mbbv2NGJGZn2fRESJfT4FBAwYZddXL8W..WzMvIDilKgIJFsGmWqag0BmJW fdZp2Nt4W34d0fS9Kk2BXGmCXTaiISy2S.sbodHibD_En6bSPv.mmaIeBQ39qmnVzLxo8IPe8thZ 5pygf6O2bluXNzg3.GNZgzEG4xOOkStA9Y4ypk4QkuFgc1PtBB2rUMZk- Received: from sonic.gate.mail.ne1.yahoo.com by sonic313.consmr.mail.gq1.yahoo.com with HTTP; Tue, 9 Apr 2019 19:19:15 +0000 Received: from c-67-169-65-224.hsd1.ca.comcast.net (EHLO localhost.localdomain) ([67.169.65.224]) by smtp401.mail.gq1.yahoo.com (Oath Hermes SMTP Server) with ESMTPA ID 70e478474b1bad4641d6b335096eeb36; Tue, 09 Apr 2019 19:19:14 +0000 (UTC) From: Casey Schaufler To: jmorris@namei.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org, casey.schaufler@intel.com Cc: keescook@chromium.org, john.johansen@canonical.com, penguin-kernel@i-love.sakura.ne.jp, paul@paul-moore.com, sds@tycho.nsa.gov Subject: [PATCH 29/59] NET: Remove scaffolding on new secmarks Date: Tue, 9 Apr 2019 12:18:18 -0700 Message-Id: <20190409191848.1380-30-casey@schaufler-ca.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20190409191848.1380-1-casey@schaufler-ca.com> References: <20190409191848.1380-1-casey@schaufler-ca.com> 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;