From: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
To: zohar@linux.ibm.com, stephen.smalley.work@gmail.com,
casey@schaufler-ca.com
Cc: jmorris@namei.org, linux-integrity@vger.kernel.org,
selinux@vger.kernel.org, linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v3 3/5] LSM: Add security_measure_data in lsm_info struct
Date: Thu, 16 Jul 2020 10:43:49 -0700 [thread overview]
Message-ID: <20200716174351.20128-4-nramas@linux.microsoft.com> (raw)
In-Reply-To: <20200716174351.20128-1-nramas@linux.microsoft.com>
The security modules that require their data to be measured using
the IMA subsystem need to define a function that the LSM can call
to trigger the measurement.
Add a function pointer field namely security_measure_data in lsm_info
structure. Update LSM to call this security module function, if defined,
to measure the security module's data using the IMA subsystem.
Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
---
include/linux/lsm_hooks.h | 3 +++
security/security.c | 48 ++++++++++++++++++++++++++++++++++++++-
2 files changed, 50 insertions(+), 1 deletion(-)
diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
index 95b7c1d32062..56f0e524838c 100644
--- a/include/linux/lsm_hooks.h
+++ b/include/linux/lsm_hooks.h
@@ -1591,6 +1591,9 @@ struct lsm_info {
int *enabled; /* Optional: controlled by CONFIG_LSM */
int (*init)(void); /* Required. */
struct lsm_blob_sizes *blobs; /* Optional: for blob sharing. */
+ int (*security_measure_data)(void); /* Optional: for measuring
+ * security module data.
+ */
};
extern struct lsm_info __start_lsm_info[], __end_lsm_info[];
diff --git a/security/security.c b/security/security.c
index 70a7ad357bc6..1afa2aebc3ac 100644
--- a/security/security.c
+++ b/security/security.c
@@ -86,6 +86,9 @@ static __initconst const char * const builtin_lsm_order = CONFIG_LSM;
static __initdata struct lsm_info **ordered_lsms;
static __initdata struct lsm_info *exclusive;
+static struct lsm_info *security_state_lsms;
+static int security_state_lsms_count;
+
static __initdata bool debug;
#define init_debug(...) \
do { \
@@ -235,6 +238,45 @@ static void __init initialize_lsm(struct lsm_info *lsm)
}
}
+static int measure_security_state(struct lsm_info *lsm)
+{
+ if (!lsm->security_measure_data)
+ return 0;
+
+ return lsm->security_measure_data();
+}
+
+static void __init initialize_security_state_lsms(void)
+{
+ struct lsm_info **lsm;
+ int count = 0;
+ int inx;
+
+ for (lsm = ordered_lsms; *lsm; lsm++) {
+ if ((*lsm)->security_measure_data)
+ count++;
+ }
+
+ if (count == 0)
+ return;
+
+ security_state_lsms = kcalloc(count, sizeof(struct lsm_info),
+ GFP_KERNEL);
+ if (!security_state_lsms)
+ return;
+
+ inx = 0;
+ for (lsm = ordered_lsms; *lsm; lsm++) {
+ if ((*lsm)->security_measure_data) {
+ security_state_lsms[inx].security_measure_data =
+ (*lsm)->security_measure_data;
+ inx++;
+ }
+ }
+
+ security_state_lsms_count = count;
+}
+
/* Populate ordered LSMs list from comma-separated LSM name list. */
static void __init ordered_lsm_parse(const char *order, const char *origin)
{
@@ -352,8 +394,12 @@ static void __init ordered_lsm_init(void)
lsm_early_cred((struct cred *) current->cred);
lsm_early_task(current);
- for (lsm = ordered_lsms; *lsm; lsm++)
+ for (lsm = ordered_lsms; *lsm; lsm++) {
initialize_lsm(*lsm);
+ measure_security_state(*lsm);
+ }
+
+ initialize_security_state_lsms();
kfree(ordered_lsms);
}
--
2.27.0
next prev parent reply other threads:[~2020-07-16 17:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-16 17:43 [PATCH v2 0/5] LSM: Measure security module state Lakshmi Ramasubramanian
2020-07-16 17:43 ` [PATCH v2 1/5] IMA: Add LSM_STATE func to measure LSM data Lakshmi Ramasubramanian
2020-07-16 17:43 ` [PATCH v2 2/5] IMA: Define an IMA hook " Lakshmi Ramasubramanian
2020-07-16 17:43 ` Lakshmi Ramasubramanian [this message]
2020-07-16 17:43 ` [PATCH v2 4/5] LSM: Define SELinux function to measure security state Lakshmi Ramasubramanian
2020-07-16 18:54 ` Stephen Smalley
2020-07-16 19:13 ` Lakshmi Ramasubramanian
2020-07-16 19:45 ` Stephen Smalley
2020-07-16 22:03 ` Lakshmi Ramasubramanian
2020-07-16 17:43 ` [PATCH v2 5/5] LSM: Define workqueue for measuring security module state Lakshmi Ramasubramanian
2020-07-17 22:28 [PATCH v3 0/5] LSM: Measure " Lakshmi Ramasubramanian
2020-07-17 22:28 ` [PATCH v3 3/5] LSM: Add security_measure_data in lsm_info struct Lakshmi Ramasubramanian
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=20200716174351.20128-4-nramas@linux.microsoft.com \
--to=nramas@linux.microsoft.com \
--cc=casey@schaufler-ca.com \
--cc=jmorris@namei.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=selinux@vger.kernel.org \
--cc=stephen.smalley.work@gmail.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).