From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6DB0DECE561 for ; Tue, 25 Sep 2018 00:25:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 26868214C5 for ; Tue, 25 Sep 2018 00:25:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="ck2/wFpi" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 26868214C5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728642AbeIYGaT (ORCPT ); Tue, 25 Sep 2018 02:30:19 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:38578 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728343AbeIYGaM (ORCPT ); Tue, 25 Sep 2018 02:30:12 -0400 Received: by mail-pf1-f195.google.com with SMTP id x17-v6so9926629pfh.5 for ; Mon, 24 Sep 2018 17:25:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=v+bgLsnYIEjOih3SRhhO7dkDnRKEzVCMNAzz+EjXpHg=; b=ck2/wFpivCOb7/CK8KeVglR5VoDX76r4hYd79A+wfNOLkLEcgXUGgqVnxKYwcMc6ML AkdbGwQzpJBB0VMnsxFyv5d0oAj9FQy+OjJoFd0UqtkzGX+cjXhY8HcVbQ0ZOy8EFzFj bVWb4JREC6bs66N2yNnqhi/DBFx/kunb4Td3A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=v+bgLsnYIEjOih3SRhhO7dkDnRKEzVCMNAzz+EjXpHg=; b=t/uKASLXzvOOSZ9ky8jhBY0ZotW2fcZlZZoqDL2tbSNsvUvN6+Nh2ZPBlXcfNe1gG/ xCCveHLHdpJbqrK7r3DEaWn/RhOV/DxKjhYL+BoVVWSchHHNdqyybi/SLGpl5daMQXmW NVviMOVcbmF/o97SGieUBGSHbCChGS16RwncwvWfcEZXEP+pWkOqQiY+D9gS1MSmIUaV UAJ8A+iJZ+nUzuO4cTe45EAzNGKLcWuAPVnkbJ0Ywc7Sf0ecp8ADWzlFysEADlwvvAyp abUs1bIyam4czVbFsOcCp+oC6sS9AzkhAWkmsFJ9Ctv/Dx7F0dAO3yISOuN9ZlQb7DC7 m3PA== X-Gm-Message-State: ABuFfoi/38s8FkcOrGQS4lqiQnTHLjCvI2gIEppQ31nNpDIxmoV+JoMb yG5lzs20nCL6mYQOGZbsczHcEw== X-Google-Smtp-Source: ACcGV61GzfRbyoeVB/zFFoHIWLaMdn1xpYcS7i99l+puB02zFzFGRU00KqLtZ5DjuLibaUXmes51yQ== X-Received: by 2002:a63:6f45:: with SMTP id k66-v6mr923000pgc.360.1537835124567; Mon, 24 Sep 2018 17:25:24 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id a11-v6sm497393pgv.29.2018.09.24.17.25.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 24 Sep 2018 17:25:20 -0700 (PDT) From: Kees Cook To: James Morris Cc: Kees Cook , Casey Schaufler , John Johansen , Tetsuo Handa , Paul Moore , Stephen Smalley , "Schaufler, Casey" , LSM , Jonathan Corbet , linux-doc@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH security-next v3 26/29] LSM: Introduce enum lsm_order Date: Mon, 24 Sep 2018 17:18:29 -0700 Message-Id: <20180925001832.18322-27-keescook@chromium.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180925001832.18322-1-keescook@chromium.org> References: <20180925001832.18322-1-keescook@chromium.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In preparation for distinguishing the "capability" LSM from other LSMs, it must be ordered first. This introduces LSM_ORDER_MUTABLE for the general LSMs, LSM_ORDER_FIRST for capabilities, and LSM_ORDER_LAST for anything that must run last (e.g. Landlock may use this in the future). Signed-off-by: Kees Cook --- include/linux/lsm_hooks.h | 7 +++++++ security/security.c | 18 ++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index 5be95c6155b4..b38902ea0be5 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h @@ -2041,8 +2041,15 @@ extern void security_add_hooks(struct security_hook_list *hooks, int count, #define LSM_FLAG_LEGACY_MAJOR BIT(0) +enum lsm_order { + LSM_ORDER_FIRST = -1, /* This is only for capabilities. */ + LSM_ORDER_MUTABLE = 0, + LSM_ORDER_LAST, +}; + struct lsm_info { const char *name; /* Populated automatically. */ + enum lsm_order order; /* Optional: default is LSM_ORDER_MUTABLE */ unsigned long flags; /* Optional: flags describing LSM */ int *enabled; /* Optional: NULL checks CONFIG_LSM_ENABLE */ int (*init)(void); diff --git a/security/security.c b/security/security.c index c4ba5832ef2f..8b93afa75e3c 100644 --- a/security/security.c +++ b/security/security.c @@ -148,7 +148,8 @@ static void __init parse_lsm_order(const char *order, const char *origin) bool found = false; for (lsm = __start_lsm_info; lsm < __end_lsm_info; lsm++) { - if ((lsm->flags & LSM_FLAG_LEGACY_MAJOR) == 0 && + if (lsm->order == LSM_ORDER_MUTABLE && + (lsm->flags & LSM_FLAG_LEGACY_MAJOR) == 0 && strcmp(lsm->name, name) == 0) { append_ordered_lsm(lsm, origin); found = true; @@ -166,6 +167,12 @@ static void __init prepare_lsm_order(void) { struct lsm_info *lsm; + /* LSM_ORDER_FIRST is always first. */ + for (lsm = __start_lsm_info; lsm < __end_lsm_info; lsm++) { + if (lsm->order == LSM_ORDER_FIRST) + append_ordered_lsm(lsm, "first"); + } + /* Parse order from commandline, if present. */ parse_lsm_order(chosen_lsm_order, "cmdline"); @@ -174,9 +181,16 @@ static void __init prepare_lsm_order(void) /* Add any missing LSMs, in link order. */ for (lsm = __start_lsm_info; lsm < __end_lsm_info; lsm++) { - if ((lsm->flags & LSM_FLAG_LEGACY_MAJOR) == 0) + if (lsm->order == LSM_ORDER_MUTABLE && + (lsm->flags & LSM_FLAG_LEGACY_MAJOR) == 0) append_ordered_lsm(lsm, "link-time"); } + + /* LSM_ORDER_LAST is always last. */ + for (lsm = __start_lsm_info; lsm < __end_lsm_info; lsm++) { + if (lsm->order == LSM_ORDER_LAST) + append_ordered_lsm(lsm, "last"); + } } /* Is an LSM allowed to be initialized? */ -- 2.17.1