From: Paul Moore <paul@paul-moore.com>
To: linux-security-module@vger.kernel.org,
linux-integrity@vger.kernel.org, selinux@vger.kernel.org
Cc: "John Johansen" <john.johansen@canonical.com>,
"Mimi Zohar" <zohar@linux.ibm.com>,
"Roberto Sassu" <roberto.sassu@huawei.com>,
"Fan Wu" <wufan@kernel.org>, "Mickaël Salaün" <mic@digikod.net>,
"Günther Noack" <gnoack@google.com>,
"Kees Cook" <kees@kernel.org>,
"Micah Morton" <mortonm@chromium.org>,
"Casey Schaufler" <casey@schaufler-ca.com>,
"Tetsuo Handa" <penguin-kernel@I-love.SAKURA.ne.jp>,
"Nicolas Bouchinet" <nicolas.bouchinet@oss.cyber.gouv.fr>,
"Xiu Jianfeng" <xiujianfeng@huawei.com>
Subject: [PATCH v5 05/34] lsm: integrate report_lsm_order() code into caller
Date: Fri, 17 Oct 2025 16:24:33 -0400 [thread overview]
Message-ID: <20251017202456.484010-41-paul@paul-moore.com> (raw)
In-Reply-To: <20251017202456.484010-36-paul@paul-moore.com>
With only one caller of report_lsm_order(), insert the function's code
directly into the caller and ger rid of report_lsm_order().
Reviewed-by: Casey Schaufler <casey@schaufler-ca.com>
Reviewed-by: John Johansen <john.johhansen@canonical.com>
Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
---
security/lsm_init.c | 33 ++++++++++++---------------------
1 file changed, 12 insertions(+), 21 deletions(-)
diff --git a/security/lsm_init.c b/security/lsm_init.c
index 18828a65c364..09afa7ad719e 100644
--- a/security/lsm_init.c
+++ b/security/lsm_init.c
@@ -291,26 +291,6 @@ static void __init ordered_lsm_parse(const char *order, const char *origin)
kfree(sep);
}
-static void __init report_lsm_order(void)
-{
- struct lsm_info **lsm, *early;
- int first = 0;
-
- pr_info("initializing lsm=");
-
- /* Report each enabled LSM name, comma separated. */
- lsm_early_for_each_raw(early) {
- if (is_enabled(early))
- pr_cont("%s%s", first++ == 0 ? "" : ",", early->name);
- }
- lsm_order_for_each(lsm) {
- if (is_enabled(*lsm))
- pr_cont("%s%s", first++ == 0 ? "" : ",", (*lsm)->name);
- }
-
- pr_cont("\n");
-}
-
/**
* lsm_early_cred - during initialization allocate a composite cred blob
* @cred: the cred that needs a blob
@@ -341,7 +321,9 @@ static void __init lsm_early_task(struct task_struct *task)
static void __init ordered_lsm_init(void)
{
+ unsigned int first = 0;
struct lsm_info **lsm;
+ struct lsm_info *early;
if (chosen_lsm_order) {
if (chosen_major_lsm) {
@@ -357,7 +339,16 @@ static void __init ordered_lsm_init(void)
lsm_prepare(*lsm);
}
- report_lsm_order();
+ pr_info("initializing lsm=");
+ lsm_early_for_each_raw(early) {
+ if (is_enabled(early))
+ pr_cont("%s%s", first++ == 0 ? "" : ",", early->name);
+ }
+ lsm_order_for_each(lsm) {
+ if (is_enabled(*lsm))
+ pr_cont("%s%s", first++ == 0 ? "" : ",", (*lsm)->name);
+ }
+ pr_cont("\n");
init_debug("cred blob size = %d\n", blob_sizes.lbs_cred);
init_debug("file blob size = %d\n", blob_sizes.lbs_file);
--
2.51.1.dirty
next prev parent reply other threads:[~2025-10-17 20:28 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-17 20:24 [PATCH v5 0/34] Rework the LSM initialization Paul Moore
2025-10-17 20:24 ` [PATCH v5 01/34] lsm: split the notifier code out into lsm_notifier.c Paul Moore
2025-10-17 20:24 ` [PATCH v5 02/34] lsm: split the init code out into lsm_init.c Paul Moore
2025-10-17 20:24 ` [PATCH v5 03/34] lsm: consolidate lsm_allowed() and prepare_lsm() into lsm_prepare() Paul Moore
2025-10-17 20:24 ` [PATCH v5 04/34] lsm: introduce looping macros for the initialization code Paul Moore
2025-10-17 20:24 ` Paul Moore [this message]
2025-10-17 20:24 ` [PATCH v5 06/34] lsm: integrate lsm_early_cred() and lsm_early_task() into caller Paul Moore
2025-10-17 20:24 ` [PATCH v5 07/34] lsm: rename ordered_lsm_init() to lsm_init_ordered() Paul Moore
2025-10-17 20:24 ` [PATCH v5 08/34] lsm: replace the name field with a pointer to the lsm_id struct Paul Moore
2025-10-17 20:24 ` [PATCH v5 09/34] lsm: rename the lsm order variables for consistency Paul Moore
2025-10-17 20:24 ` [PATCH v5 10/34] lsm: rework lsm_active_cnt and lsm_idlist[] Paul Moore
2025-10-17 20:24 ` [PATCH v5 11/34] lsm: get rid of the lsm_names list and do some cleanup Paul Moore
2025-10-17 20:24 ` [PATCH v5 12/34] lsm: rework the LSM enable/disable setter/getter functions Paul Moore
2025-10-17 20:24 ` [PATCH v5 13/34] lsm: rename exists_ordered_lsm() to lsm_order_exists() Paul Moore
2025-10-17 20:24 ` [PATCH v5 14/34] lsm: rename/rework append_ordered_lsm() into lsm_order_append() Paul Moore
2025-10-17 20:24 ` [PATCH v5 15/34] lsm: rename/rework ordered_lsm_parse() to lsm_order_parse() Paul Moore
2025-10-17 20:24 ` [PATCH v5 16/34] lsm: cleanup the LSM blob size code Paul Moore
2025-10-17 20:24 ` [PATCH v5 17/34] lsm: cleanup initialize_lsm() and rename to lsm_init_single() Paul Moore
2025-10-17 20:24 ` [PATCH v5 18/34] lsm: fold lsm_init_ordered() into security_init() Paul Moore
2025-10-17 20:24 ` [PATCH v5 19/34] lsm: add/tweak function header comment blocks in lsm_init.c Paul Moore
2025-10-17 20:24 ` [PATCH v5 20/34] lsm: cleanup the debug and console output " Paul Moore
2025-10-17 20:24 ` [PATCH v5 21/34] lsm: output available LSMs when debugging Paul Moore
2025-10-17 20:24 ` [PATCH v5 22/34] lsm: group lsm_order_parse() with the other lsm_order_*() functions Paul Moore
2025-10-17 20:48 ` [PATCH v5 01/11] loadpin: move initcalls to the LSM framework Paul Moore
2025-10-17 20:48 ` [PATCH v5 02/11] ipe: " Paul Moore
2025-10-17 20:48 ` [PATCH v5 03/11] smack: " Paul Moore
2025-10-17 20:48 ` [PATCH v5 04/11] tomoyo: " Paul Moore
2025-10-17 20:48 ` [PATCH v5 05/11] safesetid: " Paul Moore
2025-10-17 20:48 ` [PATCH v5 06/11] apparmor: " Paul Moore
2025-10-17 20:48 ` [PATCH v5 07/11] lockdown: " Paul Moore
2025-10-17 20:48 ` [PATCH v5 08/11] ima,evm: " Paul Moore
2025-10-17 20:48 ` [PATCH v5 09/11] selinux: " Paul Moore
2025-10-17 20:48 ` [PATCH v5 10/11] lsm: consolidate all of the LSM framework initcalls Paul Moore
2025-10-17 20:48 ` [PATCH v5 11/11] lsm: add a LSM_STARTED_ALL notification event Paul Moore
2025-10-17 20:59 ` [PATCH v5 0/34] Rework the LSM initialization Paul Moore
2025-10-22 23:34 ` Paul Moore
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251017202456.484010-41-paul@paul-moore.com \
--to=paul@paul-moore.com \
--cc=casey@schaufler-ca.com \
--cc=gnoack@google.com \
--cc=john.johansen@canonical.com \
--cc=kees@kernel.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=mic@digikod.net \
--cc=mortonm@chromium.org \
--cc=nicolas.bouchinet@oss.cyber.gouv.fr \
--cc=penguin-kernel@I-love.SAKURA.ne.jp \
--cc=roberto.sassu@huawei.com \
--cc=selinux@vger.kernel.org \
--cc=wufan@kernel.org \
--cc=xiujianfeng@huawei.com \
--cc=zohar@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).