From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 21B982E11D1 for ; Tue, 16 Sep 2025 22:13:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758060839; cv=none; b=mH8bep9TDf+R2LdQRib8C+HctvVsviXJlTjRcFjSKp0cXeZ1yKzm6hc9c5MY24r1mLcxr4gWRh605EQPFZHb6nk1lW16pFpLlAWWGqDTVW4GFVUQ7Ux8nkngOujU/o+el8Jr/lI8t6wqrWocqM4aUgbkSplWtflLljHBrtblPUA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758060839; c=relaxed/simple; bh=k92MwOt9mTyzeYWKAqh2sl8WRFENDrlRbHUPmeZkctA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jgAacSSTPcRkq34C5iykGPlSoeGdWHOuZXM6ykqkM8GvPHCEyyos9a9+r/XNKw1U/qzEj7Jeg0tDWpixkmSK9QEOBCx7Ii9hPTRviYszUMmxc3fP4TiryfzrH9PETKXoSRXHLlEKdxmcoB3pJr5gIPDTZ4h4ZuKS5q6coSjzJbk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=paul-moore.com; spf=pass smtp.mailfrom=paul-moore.com; dkim=pass (2048-bit key) header.d=paul-moore.com header.i=@paul-moore.com header.b=eNvinvCx; arc=none smtp.client-ip=209.85.222.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=paul-moore.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=paul-moore.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=paul-moore.com header.i=@paul-moore.com header.b="eNvinvCx" Received: by mail-qk1-f170.google.com with SMTP id af79cd13be357-80e2c52703bso531327085a.1 for ; Tue, 16 Sep 2025 15:13:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=paul-moore.com; s=google; t=1758060837; x=1758665637; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wrtH/KsP4LFzahvcKDLMyty8tAhDhmnOKOGFABJolAI=; b=eNvinvCxAuTznIJbqE8D94jvactMbPtixP4Gs5saYL1Yh2SsQP7uDonOXiVW1tk1dg 01DYz0aw4fsp9Zw9Urm7QpkLRcyTqHc4DgcOpmqMV6AAXm9wtGeLgph6vsfWkXX0N2X/ lSYcgwmC0KUwD+b1k1daQb4N89sNdOk9m8E0H6OjLZMvwsarpNuJOGWFNHAGy6rXkjkO zTRmVdnx3fLtlABw5njYsC0dEvJ7wbO0PkNdGt1p+cnqEYVGvCpa+FYTa9XjMVgJT+D1 23Lij8MSTZwghbZwR/3xSP+HxMOD1fZoCQfk5TicVyuFHz9OSCA0ml1A30qSlxjdgpUM 9mgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758060837; x=1758665637; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wrtH/KsP4LFzahvcKDLMyty8tAhDhmnOKOGFABJolAI=; b=D5BtejohWLpLIyfELtAaP3Xo8NoDc1oU1xB6/UA2Wp1MYT+/FfQR8hAe5cOjEG+UVS rliBVyRkTVNfAzkWUHW/Rb2qHaEAffmoaIJry5O0lq9g5TddmBz8+BBpeITPPoFLNsIs A0LNgqeqeqaM4PozoeLA3NVZz98ookKBVE73fToTNawwosvmAlt2Y1jGV2Yc2BMcYQAL 26oRFoKZEPd7BltvtXipZXvsYXe481tgpoa3WpT23yN0NMOmskpAiIz7aEty9y2LBqZo s07kjsl7Ybs3lt3M7C7f7kEpVZBAFk7Bt1FlhPDUCpxuuCzsDM1Z+y5uRZmYg5iZji+J /UhQ== X-Forwarded-Encrypted: i=1; AJvYcCXcdICXs6RLACnGbjuaaQYSTYY3SDKIjbd0g9QAWBE5Iytoldokn3G61NOnhhhSOHhnMOXEYsJAAxOFS5NkWFE=@vger.kernel.org X-Gm-Message-State: AOJu0YxjnPiI/kGz6zVJ+RA3ZTM/vyR7VQXY98bKVGTxYW3aIGkUi9uk I3cMu5vM4fEcXUB/vJMz3ujSEyJxTBfmDkZrIHkbjx0k3UYpGCty0n17ups1EQhtgQ== X-Gm-Gg: ASbGnctYkocNLvv3qG102y5xgBWIi5Jl1mP9Hz0DlKYxRGzT1y1b52H15dXjvE0sFS1 sE0PHwZKk2kv1F25rtizq9SR/5iXFtADjDQ96jqUi9yPNQ+XnhNHgaQZ9hvWxwDw4wQdy7EFMGv p/2SjyrlNthXWsSNrMCdDfi/MlHqQndbldPrEyQ5Stq2Bg59oMMCrgaNU0TpHtj/F1YWSXW2ugJ lC3YeCeH/BV0LGvym8FJx0xeedM0B3N3G3K3LLMS5pLAW5LtdHS8siFsyNpGC5HBdjmKT6mUW1v ZLdrWJ65Tzt+b6H5omQORLZ3S53cRiN0o/q/l0bUin2g63SwpqHhlVto0UAgJdRegx3dWAGQmkv 0peu5yOq60G1zayptFNPmp0DyNtjz4ydWBf/KqtMNoTciB63J7IZHWp9yWblocYes1nox X-Google-Smtp-Source: AGHT+IGKjXoHDjzxbVzmlEEUMONFlgIJ1ELjwNvAAsfM/KCpBzvReZ4/Qoz/oVoIo2NU9EX9NUNnCg== X-Received: by 2002:a05:620a:280b:b0:811:e100:4fea with SMTP id af79cd13be357-82402726ccemr2055132185a.51.1758060836960; Tue, 16 Sep 2025 15:13:56 -0700 (PDT) Received: from localhost (pool-71-126-255-178.bstnma.fios.verizon.net. [71.126.255.178]) by smtp.gmail.com with UTF8SMTPSA id af79cd13be357-820c974d54asm1025872185a.19.2025.09.16.15.13.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Sep 2025 15:13:55 -0700 (PDT) From: Paul Moore To: linux-security-module@vger.kernel.org, linux-integrity@vger.kernel.org, selinux@vger.kernel.org Cc: John Johansen , Mimi Zohar , Roberto Sassu , Fan Wu , =?UTF-8?q?Micka=C3=ABl=20Sala=C3=BCn?= , =?UTF-8?q?G=C3=BCnther=20Noack?= , Kees Cook , Micah Morton , Casey Schaufler , Tetsuo Handa , Nicolas Bouchinet , Xiu Jianfeng Subject: [PATCH v4 12/34] lsm: rework the LSM enable/disable setter/getter functions Date: Tue, 16 Sep 2025 18:03:39 -0400 Message-ID: <20250916220355.252592-48-paul@paul-moore.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250916220355.252592-36-paul@paul-moore.com> References: <20250916220355.252592-36-paul@paul-moore.com> Precedence: bulk X-Mailing-List: linux-integrity@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=5507; i=paul@paul-moore.com; h=from:subject; bh=k92MwOt9mTyzeYWKAqh2sl8WRFENDrlRbHUPmeZkctA=; b=kA0DAAoB6iDy2pc3iXMByyZiAGjJ3vCiAHO901Xf88p+K/LyZETpeItHRBTo9cI3rTg9/ktH5 YkCMwQAAQoAHRYhBEtCqM8H8pnVVJd+7+og8tqXN4lzBQJoyd7wAAoJEOog8tqXN4lz7HwQALl5 dqhG2uweggTvev6L6z0CohHvUSFKNc9xxk5Hvn1DF3AV/If/4MRnIeM8103VpjIGecvJzx9Yyxg IYU7R+46opzrggSrus5uX4EoCdSkJAybC8lsQflLXjzATRUcWp6vtTh5wYTzg/ea1buQVw2wDGU VUlss+4c1Tx41x4rZ+pUKhdUx2CHr9EL8nf7aVG2sGgQo4JuL/5f+OVu26fu+bMjbbN10WW3EEg c2t0EkcKQfrjEq0A5VsQRUCtSqde5LwBHp25kxBWMivOSZSc6hyR5onN/TRoWaETsRVybs/V/RC Z6PYYDuLIqV5c/aDXtpzuaSYvjk1G1HNGaFh9Um9wV2XzzoP0EU2wrOsy4raEURm38IKrD4dU2H YO02oKIjEkI4ZfYCdMIz/3qshpXKrhU3yrwdGE1y42M6tN+p5+j+a7p/ElhbJnYshrygyv3VG+D LWct11Gn5O4JgxMK5V32laGdsSTXVx6MMETLHM35NyZkdXUyBVa4CTGkwP0u/nPijy00+Npcbza qeUAjcwI6wuIvGVU0U4z9feV1TQNde9Je3I7wKFh8cztZCM5OvCfFePzLmdgXuYlZeD2bBGojBr Ht1hUY6s95UYFKpOP3J/znBkK04mkPMxbdZA+97U9mHyt04Qmq+GggIWFEqGfvjP4MuYi+lmIW8 FxZiu X-Developer-Key: i=paul@paul-moore.com; a=openpgp; fpr=7100AADFAE6E6E940D2E0AD655E45A5AE8CA7C8A Content-Transfer-Encoding: 8bit In addition to style changes, rename set_enabled() to lsm_enabled_set() and is_enabled() to lsm_is_enabled() to better fit within the LSM initialization code. Reviewed-by: Casey Schaufler Reviewed-by: John Johansen Signed-off-by: Paul Moore --- security/lsm_init.c | 62 ++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/security/lsm_init.c b/security/lsm_init.c index 87e2147016b3..2cfd72ade6fb 100644 --- a/security/lsm_init.c +++ b/security/lsm_init.c @@ -10,6 +10,10 @@ #include "lsm.h" +/* LSM enabled constants. */ +static __initdata int lsm_enabled_true = 1; +static __initdata int lsm_enabled_false = 0; + /* Pointers to LSM sections defined in include/asm-generic/vmlinux.lds.h */ extern struct lsm_info __start_lsm_info[], __end_lsm_info[]; extern struct lsm_info __start_early_lsm_info[], __end_early_lsm_info[]; @@ -75,37 +79,33 @@ static int __init lsm_debug_enable(char *str) } __setup("lsm.debug", lsm_debug_enable); -/* Mark an LSM's enabled flag. */ -static int lsm_enabled_true __initdata = 1; -static int lsm_enabled_false __initdata = 0; -static void __init set_enabled(struct lsm_info *lsm, bool enabled) +/** + * lsm_enabled_set - Mark a LSM as enabled + * @lsm: LSM definition + * @enabled: enabled flag + */ +static void __init lsm_enabled_set(struct lsm_info *lsm, bool enabled) { /* * When an LSM hasn't configured an enable variable, we can use * a hard-coded location for storing the default enabled state. */ - if (!lsm->enabled) { - if (enabled) - lsm->enabled = &lsm_enabled_true; - else - lsm->enabled = &lsm_enabled_false; - } else if (lsm->enabled == &lsm_enabled_true) { - if (!enabled) - lsm->enabled = &lsm_enabled_false; - } else if (lsm->enabled == &lsm_enabled_false) { - if (enabled) - lsm->enabled = &lsm_enabled_true; + if (!lsm->enabled || + lsm->enabled == &lsm_enabled_true || + lsm->enabled == &lsm_enabled_false) { + lsm->enabled = enabled ? &lsm_enabled_true : &lsm_enabled_false; } else { *lsm->enabled = enabled; } } -static inline bool is_enabled(struct lsm_info *lsm) +/** + * lsm_is_enabled - Determine if a LSM is enabled + * @lsm: LSM definition + */ +static inline bool lsm_is_enabled(struct lsm_info *lsm) { - if (!lsm->enabled) - return false; - - return *lsm->enabled; + return (lsm->enabled ? *lsm->enabled : false); } /* Is an LSM already listed in the ordered LSMs list? */ @@ -139,7 +139,7 @@ static void __init append_ordered_lsm(struct lsm_info *lsm, const char *from) lsm_idlist[last_lsm++] = lsm->id; init_debug("%s ordered: %s (%s)\n", from, lsm->id->name, - is_enabled(lsm) ? "enabled" : "disabled"); + lsm_is_enabled(lsm) ? "enabled" : "disabled"); } static void __init lsm_set_blob_size(int *need, int *lbs) @@ -162,17 +162,17 @@ static void __init lsm_prepare(struct lsm_info *lsm) { struct lsm_blob_sizes *blobs; - if (!is_enabled(lsm)) { - set_enabled(lsm, false); + if (!lsm_is_enabled(lsm)) { + lsm_enabled_set(lsm, false); return; } else if ((lsm->flags & LSM_FLAG_EXCLUSIVE) && lsm_exclusive) { init_debug("exclusive disabled: %s\n", lsm->id->name); - set_enabled(lsm, false); + lsm_enabled_set(lsm, false); return; } /* Mark the LSM as enabled. */ - set_enabled(lsm, true); + lsm_enabled_set(lsm, true); if ((lsm->flags & LSM_FLAG_EXCLUSIVE) && !lsm_exclusive) { init_debug("exclusive chosen: %s\n", lsm->id->name); lsm_exclusive = lsm; @@ -206,7 +206,7 @@ static void __init lsm_prepare(struct lsm_info *lsm) /* Initialize a given LSM, if it is enabled. */ static void __init initialize_lsm(struct lsm_info *lsm) { - if (is_enabled(lsm)) { + if (lsm_is_enabled(lsm)) { int ret; init_debug("initializing %s\n", lsm->id->name); @@ -240,7 +240,7 @@ static void __init ordered_lsm_parse(const char *order, const char *origin) lsm_for_each_raw(major) { if ((major->flags & LSM_FLAG_LEGACY_MAJOR) && strcmp(major->id->name, lsm_order_legacy) != 0) { - set_enabled(major, false); + lsm_enabled_set(major, false); init_debug("security=%s disabled: %s (only one legacy major LSM)\n", lsm_order_legacy, major->id->name); } @@ -286,7 +286,7 @@ static void __init ordered_lsm_parse(const char *order, const char *origin) lsm_for_each_raw(lsm) { if (exists_ordered_lsm(lsm)) continue; - set_enabled(lsm, false); + lsm_enabled_set(lsm, false); init_debug("%s skipped: %s (not in requested order)\n", origin, lsm->id->name); } @@ -319,12 +319,12 @@ static void __init lsm_init_ordered(void) pr_info("initializing lsm="); lsm_early_for_each_raw(early) { - if (is_enabled(early)) + if (lsm_is_enabled(early)) pr_cont("%s%s", first++ == 0 ? "" : ",", early->id->name); } lsm_order_for_each(lsm) { - if (is_enabled(*lsm)) + if (lsm_is_enabled(*lsm)) pr_cont("%s%s", first++ == 0 ? "" : ",", (*lsm)->id->name); } @@ -440,7 +440,7 @@ int __init security_init(void) */ lsm_early_for_each_raw(lsm) { init_debug(" early started: %s (%s)\n", lsm->id->name, - is_enabled(lsm) ? "enabled" : "disabled"); + lsm_is_enabled(lsm) ? "enabled" : "disabled"); } /* Load LSMs in specified order. */ -- 2.51.0