From: Casey Schaufler <casey@schaufler-ca.com> To: casey.schaufler@intel.com, jmorris@namei.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org Cc: casey@schaufler-ca.com, linux-audit@redhat.com, keescook@chromium.org, john.johansen@canonical.com, penguin-kernel@i-love.sakura.ne.jp, paul@paul-moore.com, sds@tycho.nsa.gov, linux-kernel@vger.kernel.org Subject: [PATCH v24 03/25] LSM: provide lsm name and id slot mappings Date: Tue, 26 Jan 2021 08:40:46 -0800 [thread overview] Message-ID: <20210126164108.1958-4-casey@schaufler-ca.com> (raw) In-Reply-To: <20210126164108.1958-1-casey@schaufler-ca.com> Provide interfaces to map LSM slot numbers and LSM names. Update the LSM registration code to save this information. Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> --- include/linux/security.h | 4 ++++ security/security.c | 45 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/include/linux/security.h b/include/linux/security.h index 4a109092a8d7..a99a4307176f 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -192,6 +192,10 @@ static inline bool lsmblob_equal(struct lsmblob *bloba, struct lsmblob *blobb) return !memcmp(bloba, blobb, sizeof(*bloba)); } +/* Map lsm names to blob slot numbers */ +extern int lsm_name_to_slot(char *name); +extern const char *lsm_slot_to_name(int slot); + /* These functions are in security/commoncap.c */ extern int cap_capable(const struct cred *cred, struct user_namespace *ns, int cap, unsigned int opts); diff --git a/security/security.c b/security/security.c index 39dce9eb3bcd..05ce02ae7c46 100644 --- a/security/security.c +++ b/security/security.c @@ -474,6 +474,50 @@ static int lsm_append(const char *new, char **result) * Current index to use while initializing the lsmblob secid list. */ static int lsm_slot __lsm_ro_after_init; +static struct lsm_id *lsm_slotlist[LSMBLOB_ENTRIES] __lsm_ro_after_init; + +/** + * lsm_name_to_slot - Report the slot number for a security module + * @name: name of the security module + * + * Look up the slot number for the named security module. + * Returns the slot number or LSMBLOB_INVALID if @name is not + * a registered security module name. + */ +int lsm_name_to_slot(char *name) +{ + int i; + + for (i = 0; i < lsm_slot; i++) + if (strcmp(lsm_slotlist[i]->lsm, name) == 0) + return i; + + return LSMBLOB_INVALID; +} + +/** + * lsm_slot_to_name - Get the name of the security module in a slot + * @slot: index into the interface LSM slot list. + * + * Provide the name of the security module associated with + * a interface LSM slot. + * + * If @slot is LSMBLOB_INVALID return the value + * for slot 0 if it has been set, otherwise NULL. + * + * Returns a pointer to the name string or NULL. + */ +const char *lsm_slot_to_name(int slot) +{ + if (slot == LSMBLOB_INVALID) + slot = 0; + else if (slot >= LSMBLOB_ENTRIES || slot < 0) + return NULL; + + if (lsm_slotlist[slot] == NULL) + return NULL; + return lsm_slotlist[slot]->lsm; +} /** * security_add_hooks - Add a modules hooks to the hook lists. @@ -493,6 +537,7 @@ void __init security_add_hooks(struct security_hook_list *hooks, int count, if (lsmid->slot == LSMBLOB_NEEDED) { if (lsm_slot >= LSMBLOB_ENTRIES) panic("%s Too many LSMs registered.\n", __func__); + lsm_slotlist[lsm_slot] = lsmid; lsmid->slot = lsm_slot++; init_debug("%s assigned lsmblob slot %d\n", lsmid->lsm, lsmid->slot); -- 2.25.4
WARNING: multiple messages have this Message-ID (diff)
From: Casey Schaufler <casey@schaufler-ca.com> To: casey.schaufler@intel.com, jmorris@namei.org, linux-security-module@vger.kernel.org, selinux@vger.kernel.org Cc: john.johansen@canonical.com, linux-kernel@vger.kernel.org, linux-audit@redhat.com, sds@tycho.nsa.gov Subject: [PATCH v24 03/25] LSM: provide lsm name and id slot mappings Date: Tue, 26 Jan 2021 08:40:46 -0800 [thread overview] Message-ID: <20210126164108.1958-4-casey@schaufler-ca.com> (raw) In-Reply-To: <20210126164108.1958-1-casey@schaufler-ca.com> Provide interfaces to map LSM slot numbers and LSM names. Update the LSM registration code to save this information. Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> --- include/linux/security.h | 4 ++++ security/security.c | 45 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+) diff --git a/include/linux/security.h b/include/linux/security.h index 4a109092a8d7..a99a4307176f 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -192,6 +192,10 @@ static inline bool lsmblob_equal(struct lsmblob *bloba, struct lsmblob *blobb) return !memcmp(bloba, blobb, sizeof(*bloba)); } +/* Map lsm names to blob slot numbers */ +extern int lsm_name_to_slot(char *name); +extern const char *lsm_slot_to_name(int slot); + /* These functions are in security/commoncap.c */ extern int cap_capable(const struct cred *cred, struct user_namespace *ns, int cap, unsigned int opts); diff --git a/security/security.c b/security/security.c index 39dce9eb3bcd..05ce02ae7c46 100644 --- a/security/security.c +++ b/security/security.c @@ -474,6 +474,50 @@ static int lsm_append(const char *new, char **result) * Current index to use while initializing the lsmblob secid list. */ static int lsm_slot __lsm_ro_after_init; +static struct lsm_id *lsm_slotlist[LSMBLOB_ENTRIES] __lsm_ro_after_init; + +/** + * lsm_name_to_slot - Report the slot number for a security module + * @name: name of the security module + * + * Look up the slot number for the named security module. + * Returns the slot number or LSMBLOB_INVALID if @name is not + * a registered security module name. + */ +int lsm_name_to_slot(char *name) +{ + int i; + + for (i = 0; i < lsm_slot; i++) + if (strcmp(lsm_slotlist[i]->lsm, name) == 0) + return i; + + return LSMBLOB_INVALID; +} + +/** + * lsm_slot_to_name - Get the name of the security module in a slot + * @slot: index into the interface LSM slot list. + * + * Provide the name of the security module associated with + * a interface LSM slot. + * + * If @slot is LSMBLOB_INVALID return the value + * for slot 0 if it has been set, otherwise NULL. + * + * Returns a pointer to the name string or NULL. + */ +const char *lsm_slot_to_name(int slot) +{ + if (slot == LSMBLOB_INVALID) + slot = 0; + else if (slot >= LSMBLOB_ENTRIES || slot < 0) + return NULL; + + if (lsm_slotlist[slot] == NULL) + return NULL; + return lsm_slotlist[slot]->lsm; +} /** * security_add_hooks - Add a modules hooks to the hook lists. @@ -493,6 +537,7 @@ void __init security_add_hooks(struct security_hook_list *hooks, int count, if (lsmid->slot == LSMBLOB_NEEDED) { if (lsm_slot >= LSMBLOB_ENTRIES) panic("%s Too many LSMs registered.\n", __func__); + lsm_slotlist[lsm_slot] = lsmid; lsmid->slot = lsm_slot++; init_debug("%s assigned lsmblob slot %d\n", lsmid->lsm, lsmid->slot); -- 2.25.4 -- Linux-audit mailing list Linux-audit@redhat.com https://www.redhat.com/mailman/listinfo/linux-audit
next prev parent reply other threads:[~2021-01-26 18:11 UTC|newest] Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <20210126164108.1958-1-casey.ref@schaufler-ca.com> 2021-01-26 16:40 ` [PATCH v24 00/25] LSM: Module stacking for AppArmor Casey Schaufler 2021-01-26 16:40 ` Casey Schaufler 2021-01-26 16:40 ` [PATCH v24 01/25] LSM: Infrastructure management of the sock security Casey Schaufler 2021-01-26 16:40 ` Casey Schaufler 2021-01-26 16:40 ` [PATCH v24 02/25] LSM: Add the lsmblob data structure Casey Schaufler 2021-01-26 16:40 ` Casey Schaufler 2021-01-26 16:40 ` Casey Schaufler [this message] 2021-01-26 16:40 ` [PATCH v24 03/25] LSM: provide lsm name and id slot mappings Casey Schaufler 2021-01-26 16:40 ` [PATCH v24 04/25] IMA: avoid label collisions with stacked LSMs Casey Schaufler 2021-01-26 16:40 ` Casey Schaufler 2021-02-14 18:21 ` Mimi Zohar 2021-02-16 15:26 ` Casey Schaufler 2021-02-16 15:26 ` Casey Schaufler 2021-02-22 23:45 ` Casey Schaufler 2021-02-22 23:45 ` Casey Schaufler 2021-02-23 0:27 ` Mimi Zohar 2021-02-23 0:27 ` Mimi Zohar 2021-01-26 16:40 ` [PATCH v24 05/25] LSM: Use lsmblob in security_audit_rule_match Casey Schaufler 2021-01-26 16:40 ` Casey Schaufler 2021-01-26 16:40 ` [PATCH v24 06/25] LSM: Use lsmblob in security_kernel_act_as Casey Schaufler 2021-01-26 16:40 ` Casey Schaufler 2021-01-26 16:40 ` [PATCH v24 07/25] LSM: Use lsmblob in security_secctx_to_secid Casey Schaufler 2021-01-26 16:40 ` Casey Schaufler 2021-01-26 16:40 ` [PATCH v24 08/25] LSM: Use lsmblob in security_secid_to_secctx Casey Schaufler 2021-01-26 16:40 ` Casey Schaufler 2021-01-26 16:40 ` [PATCH v24 09/25] LSM: Use lsmblob in security_ipc_getsecid Casey Schaufler 2021-01-26 16:40 ` Casey Schaufler 2021-01-26 16:40 ` [PATCH v24 10/25] LSM: Use lsmblob in security_task_getsecid Casey Schaufler 2021-01-26 16:40 ` Casey Schaufler 2021-01-26 16:40 ` [PATCH v24 11/25] LSM: Use lsmblob in security_inode_getsecid Casey Schaufler 2021-01-26 16:40 ` Casey Schaufler 2021-01-26 16:40 ` [PATCH v24 12/25] LSM: Use lsmblob in security_cred_getsecid Casey Schaufler 2021-01-26 16:40 ` Casey Schaufler 2021-01-26 16:40 ` [PATCH v24 13/25] IMA: Change internal interfaces to use lsmblobs Casey Schaufler 2021-01-26 16:40 ` Casey Schaufler 2021-01-26 16:40 ` [PATCH v24 14/25] LSM: Specify which LSM to display Casey Schaufler 2021-01-26 16:40 ` Casey Schaufler 2021-01-26 16:40 ` [PATCH v24 15/25] LSM: Ensure the correct LSM context releaser Casey Schaufler 2021-01-26 16:40 ` Casey Schaufler 2021-01-26 16:40 ` [PATCH v24 16/25] LSM: Use lsmcontext in security_secid_to_secctx Casey Schaufler 2021-01-26 16:40 ` Casey Schaufler 2021-01-26 16:41 ` [PATCH v24 17/25] LSM: Use lsmcontext in security_inode_getsecctx Casey Schaufler 2021-01-26 16:41 ` Casey Schaufler 2021-01-26 16:41 ` [PATCH v24 18/25] LSM: security_secid_to_secctx in netlink netfilter Casey Schaufler 2021-01-26 16:41 ` Casey Schaufler 2021-01-26 16:41 ` [PATCH v24 19/25] NET: Store LSM netlabel data in a lsmblob Casey Schaufler 2021-01-26 16:41 ` Casey Schaufler 2021-01-26 16:41 ` [PATCH v24 20/25] LSM: Verify LSM display sanity in binder Casey Schaufler 2021-01-26 16:41 ` Casey Schaufler 2021-01-26 16:41 ` [PATCH v24 21/25] audit: add support for non-syscall auxiliary records Casey Schaufler 2021-01-26 16:41 ` Casey Schaufler 2021-01-26 18:42 ` Richard Guy Briggs 2021-01-26 18:42 ` Richard Guy Briggs 2021-01-26 18:58 ` Casey Schaufler 2021-01-26 18:58 ` Casey Schaufler 2021-01-26 20:05 ` Paul Moore 2021-01-26 20:05 ` Paul Moore 2021-01-26 20:22 ` Richard Guy Briggs 2021-01-26 20:22 ` Richard Guy Briggs 2021-01-26 16:41 ` [PATCH v24 22/25] Audit: Add new record for multiple process LSM attributes Casey Schaufler 2021-01-26 16:41 ` Casey Schaufler 2021-01-26 16:41 ` [PATCH v24 23/25] Audit: Add a new record for multiple object " Casey Schaufler 2021-01-26 16:41 ` Casey Schaufler 2021-01-26 16:41 ` [PATCH v24 24/25] LSM: Add /proc attr entry for full LSM context Casey Schaufler 2021-01-26 16:41 ` Casey Schaufler 2021-01-26 16:41 ` [PATCH v24 25/25] AppArmor: Remove the exclusive flag Casey Schaufler 2021-01-26 16:41 ` Casey Schaufler 2021-02-02 12:05 ` [PATCH v24 00/25] LSM: Module stacking for AppArmor Topi Miettinen 2021-02-02 12:05 ` Topi Miettinen 2021-02-02 15:30 ` Casey Schaufler 2021-02-02 15:30 ` Casey Schaufler 2021-02-02 17:12 ` Topi Miettinen 2021-02-02 17:12 ` Topi Miettinen 2021-02-02 18:06 ` Casey Schaufler 2021-02-02 18:06 ` Casey Schaufler
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=20210126164108.1958-4-casey@schaufler-ca.com \ --to=casey@schaufler-ca.com \ --cc=casey.schaufler@intel.com \ --cc=jmorris@namei.org \ --cc=john.johansen@canonical.com \ --cc=keescook@chromium.org \ --cc=linux-audit@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --cc=paul@paul-moore.com \ --cc=penguin-kernel@i-love.sakura.ne.jp \ --cc=sds@tycho.nsa.gov \ --cc=selinux@vger.kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.