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 Subject: [PATCH v35 07/29] LSM: Use lsmblob in security_kernel_act_as Date: Mon, 18 Apr 2022 07:59:23 -0700 [thread overview] Message-ID: <20220418145945.38797-8-casey@schaufler-ca.com> (raw) In-Reply-To: <20220418145945.38797-1-casey@schaufler-ca.com> Change the security_kernel_act_as interface to use a lsmblob structure in place of the single u32 secid in support of module stacking. Change its only caller, set_security_override, to do the same. Change that one's only caller, set_security_override_from_ctx, to call it with the new parameter type. The security module hook is unchanged, still taking a secid. The infrastructure passes the correct entry from the lsmblob. lsmblob_init() is used to fill the lsmblob structure, however this will be removed later in the series when security_secctx_to_secid() is updated to provide a lsmblob instead of a secid. Reviewed-by: Kees Cook <keescook@chromium.org> Reviewed-by: John Johansen <john.johansen@canonical.com> Acked-by: Stephen Smalley <stephen.smalley.work@gmail.com> Acked-by: Paul Moore <paul@paul-moore.com> Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> To: David Howells <dhowells@redhat.com> --- include/linux/cred.h | 3 ++- include/linux/security.h | 5 +++-- kernel/cred.c | 10 ++++++---- security/security.c | 14 ++++++++++++-- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/include/linux/cred.h b/include/linux/cred.h index 9ed9232af934..610f70a99f60 100644 --- a/include/linux/cred.h +++ b/include/linux/cred.h @@ -18,6 +18,7 @@ struct cred; struct inode; +struct lsmblob; /* * COW Supplementary groups list @@ -165,7 +166,7 @@ extern const struct cred *override_creds(const struct cred *); extern void revert_creds(const struct cred *); extern struct cred *prepare_kernel_cred(struct task_struct *); extern int change_create_files_as(struct cred *, struct inode *); -extern int set_security_override(struct cred *, u32); +extern int set_security_override(struct cred *, struct lsmblob *); extern int set_security_override_from_ctx(struct cred *, const char *); extern int set_create_files_as(struct cred *, struct inode *); extern int cred_fscmp(const struct cred *, const struct cred *); diff --git a/include/linux/security.h b/include/linux/security.h index ee5d14dac65f..68ab0add23d3 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -463,7 +463,7 @@ void security_cred_free(struct cred *cred); int security_prepare_creds(struct cred *new, const struct cred *old, gfp_t gfp); void security_transfer_creds(struct cred *new, const struct cred *old); void security_cred_getsecid(const struct cred *c, u32 *secid); -int security_kernel_act_as(struct cred *new, u32 secid); +int security_kernel_act_as(struct cred *new, struct lsmblob *blob); int security_kernel_create_files_as(struct cred *new, struct inode *inode); int security_kernel_module_request(char *kmod_name); int security_kernel_load_data(enum kernel_load_data_id id, bool contents); @@ -1105,7 +1105,8 @@ static inline void security_cred_getsecid(const struct cred *c, u32 *secid) *secid = 0; } -static inline int security_kernel_act_as(struct cred *cred, u32 secid) +static inline int security_kernel_act_as(struct cred *cred, + struct lsmblob *blob) { return 0; } diff --git a/kernel/cred.c b/kernel/cred.c index e10c15f51c1f..3925d38f49f4 100644 --- a/kernel/cred.c +++ b/kernel/cred.c @@ -767,14 +767,14 @@ EXPORT_SYMBOL(prepare_kernel_cred); /** * set_security_override - Set the security ID in a set of credentials * @new: The credentials to alter - * @secid: The LSM security ID to set + * @blob: The LSM security information to set * * Set the LSM security ID in a set of credentials so that the subjective * security is overridden when an alternative set of credentials is used. */ -int set_security_override(struct cred *new, u32 secid) +int set_security_override(struct cred *new, struct lsmblob *blob) { - return security_kernel_act_as(new, secid); + return security_kernel_act_as(new, blob); } EXPORT_SYMBOL(set_security_override); @@ -790,6 +790,7 @@ EXPORT_SYMBOL(set_security_override); */ int set_security_override_from_ctx(struct cred *new, const char *secctx) { + struct lsmblob blob; u32 secid; int ret; @@ -797,7 +798,8 @@ int set_security_override_from_ctx(struct cred *new, const char *secctx) if (ret < 0) return ret; - return set_security_override(new, secid); + lsmblob_init(&blob, secid); + return set_security_override(new, &blob); } EXPORT_SYMBOL(set_security_override_from_ctx); diff --git a/security/security.c b/security/security.c index ced1c76a380f..e9f1487af0e5 100644 --- a/security/security.c +++ b/security/security.c @@ -1816,9 +1816,19 @@ void security_cred_getsecid(const struct cred *c, u32 *secid) } EXPORT_SYMBOL(security_cred_getsecid); -int security_kernel_act_as(struct cred *new, u32 secid) +int security_kernel_act_as(struct cred *new, struct lsmblob *blob) { - return call_int_hook(kernel_act_as, 0, new, secid); + struct security_hook_list *hp; + int rc; + + hlist_for_each_entry(hp, &security_hook_heads.kernel_act_as, list) { + if (WARN_ON(hp->lsmid->slot < 0 || hp->lsmid->slot >= lsm_slot)) + continue; + rc = hp->hook.kernel_act_as(new, blob->secid[hp->lsmid->slot]); + if (rc != 0) + return rc; + } + return 0; } int security_kernel_create_files_as(struct cred *new, struct inode *inode) -- 2.35.1 -- Linux-audit mailing list Linux-audit@redhat.com https://listman.redhat.com/mailman/listinfo/linux-audit
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: 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, stephen.smalley.work@gmail.com, linux-kernel@vger.kernel.org Subject: [PATCH v35 07/29] LSM: Use lsmblob in security_kernel_act_as Date: Mon, 18 Apr 2022 07:59:23 -0700 [thread overview] Message-ID: <20220418145945.38797-8-casey@schaufler-ca.com> (raw) In-Reply-To: <20220418145945.38797-1-casey@schaufler-ca.com> Change the security_kernel_act_as interface to use a lsmblob structure in place of the single u32 secid in support of module stacking. Change its only caller, set_security_override, to do the same. Change that one's only caller, set_security_override_from_ctx, to call it with the new parameter type. The security module hook is unchanged, still taking a secid. The infrastructure passes the correct entry from the lsmblob. lsmblob_init() is used to fill the lsmblob structure, however this will be removed later in the series when security_secctx_to_secid() is updated to provide a lsmblob instead of a secid. Reviewed-by: Kees Cook <keescook@chromium.org> Reviewed-by: John Johansen <john.johansen@canonical.com> Acked-by: Stephen Smalley <stephen.smalley.work@gmail.com> Acked-by: Paul Moore <paul@paul-moore.com> Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> To: David Howells <dhowells@redhat.com> --- include/linux/cred.h | 3 ++- include/linux/security.h | 5 +++-- kernel/cred.c | 10 ++++++---- security/security.c | 14 ++++++++++++-- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/include/linux/cred.h b/include/linux/cred.h index 9ed9232af934..610f70a99f60 100644 --- a/include/linux/cred.h +++ b/include/linux/cred.h @@ -18,6 +18,7 @@ struct cred; struct inode; +struct lsmblob; /* * COW Supplementary groups list @@ -165,7 +166,7 @@ extern const struct cred *override_creds(const struct cred *); extern void revert_creds(const struct cred *); extern struct cred *prepare_kernel_cred(struct task_struct *); extern int change_create_files_as(struct cred *, struct inode *); -extern int set_security_override(struct cred *, u32); +extern int set_security_override(struct cred *, struct lsmblob *); extern int set_security_override_from_ctx(struct cred *, const char *); extern int set_create_files_as(struct cred *, struct inode *); extern int cred_fscmp(const struct cred *, const struct cred *); diff --git a/include/linux/security.h b/include/linux/security.h index ee5d14dac65f..68ab0add23d3 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -463,7 +463,7 @@ void security_cred_free(struct cred *cred); int security_prepare_creds(struct cred *new, const struct cred *old, gfp_t gfp); void security_transfer_creds(struct cred *new, const struct cred *old); void security_cred_getsecid(const struct cred *c, u32 *secid); -int security_kernel_act_as(struct cred *new, u32 secid); +int security_kernel_act_as(struct cred *new, struct lsmblob *blob); int security_kernel_create_files_as(struct cred *new, struct inode *inode); int security_kernel_module_request(char *kmod_name); int security_kernel_load_data(enum kernel_load_data_id id, bool contents); @@ -1105,7 +1105,8 @@ static inline void security_cred_getsecid(const struct cred *c, u32 *secid) *secid = 0; } -static inline int security_kernel_act_as(struct cred *cred, u32 secid) +static inline int security_kernel_act_as(struct cred *cred, + struct lsmblob *blob) { return 0; } diff --git a/kernel/cred.c b/kernel/cred.c index e10c15f51c1f..3925d38f49f4 100644 --- a/kernel/cred.c +++ b/kernel/cred.c @@ -767,14 +767,14 @@ EXPORT_SYMBOL(prepare_kernel_cred); /** * set_security_override - Set the security ID in a set of credentials * @new: The credentials to alter - * @secid: The LSM security ID to set + * @blob: The LSM security information to set * * Set the LSM security ID in a set of credentials so that the subjective * security is overridden when an alternative set of credentials is used. */ -int set_security_override(struct cred *new, u32 secid) +int set_security_override(struct cred *new, struct lsmblob *blob) { - return security_kernel_act_as(new, secid); + return security_kernel_act_as(new, blob); } EXPORT_SYMBOL(set_security_override); @@ -790,6 +790,7 @@ EXPORT_SYMBOL(set_security_override); */ int set_security_override_from_ctx(struct cred *new, const char *secctx) { + struct lsmblob blob; u32 secid; int ret; @@ -797,7 +798,8 @@ int set_security_override_from_ctx(struct cred *new, const char *secctx) if (ret < 0) return ret; - return set_security_override(new, secid); + lsmblob_init(&blob, secid); + return set_security_override(new, &blob); } EXPORT_SYMBOL(set_security_override_from_ctx); diff --git a/security/security.c b/security/security.c index ced1c76a380f..e9f1487af0e5 100644 --- a/security/security.c +++ b/security/security.c @@ -1816,9 +1816,19 @@ void security_cred_getsecid(const struct cred *c, u32 *secid) } EXPORT_SYMBOL(security_cred_getsecid); -int security_kernel_act_as(struct cred *new, u32 secid) +int security_kernel_act_as(struct cred *new, struct lsmblob *blob) { - return call_int_hook(kernel_act_as, 0, new, secid); + struct security_hook_list *hp; + int rc; + + hlist_for_each_entry(hp, &security_hook_heads.kernel_act_as, list) { + if (WARN_ON(hp->lsmid->slot < 0 || hp->lsmid->slot >= lsm_slot)) + continue; + rc = hp->hook.kernel_act_as(new, blob->secid[hp->lsmid->slot]); + if (rc != 0) + return rc; + } + return 0; } int security_kernel_create_files_as(struct cred *new, struct inode *inode) -- 2.35.1
next prev parent reply other threads:[~2022-04-18 15:03 UTC|newest] Thread overview: 132+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <20220418145945.38797-1-casey.ref@schaufler-ca.com> 2022-04-18 14:59 ` [PATCH v35 00/29] LSM: Module stacking for AppArmor Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-18 14:59 ` [PATCH v35 01/29] integrity: disassociate ima_filter_rule from security_audit_rule Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-21 16:51 ` John Johansen 2022-04-21 16:51 ` John Johansen 2022-04-18 14:59 ` [PATCH v35 02/29] LSM: Infrastructure management of the sock security Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-18 14:59 ` [PATCH v35 03/29] LSM: Add the lsmblob data structure Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-26 23:15 ` John Johansen 2022-04-26 23:15 ` John Johansen 2022-04-18 14:59 ` [PATCH v35 04/29] LSM: provide lsm name and id slot mappings Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-21 16:50 ` John Johansen 2022-04-21 16:50 ` John Johansen 2022-04-18 14:59 ` [PATCH v35 05/29] IMA: avoid label collisions with stacked LSMs Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-19 16:50 ` Casey Schaufler 2022-04-20 19:23 ` Mimi Zohar 2022-04-20 21:15 ` Casey Schaufler 2022-04-21 3:22 ` Mimi Zohar 2022-04-21 16:50 ` John Johansen 2022-04-21 16:50 ` John Johansen 2022-04-18 14:59 ` [PATCH v35 06/29] LSM: Use lsmblob in security_audit_rule_match Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-21 16:49 ` John Johansen 2022-04-21 16:49 ` John Johansen 2022-04-18 14:59 ` Casey Schaufler [this message] 2022-04-18 14:59 ` [PATCH v35 07/29] LSM: Use lsmblob in security_kernel_act_as Casey Schaufler 2022-04-18 14:59 ` [PATCH v35 08/29] LSM: Use lsmblob in security_secctx_to_secid Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-27 0:38 ` John Johansen 2022-04-27 0:38 ` John Johansen 2022-04-18 14:59 ` [PATCH v35 09/29] LSM: Use lsmblob in security_secid_to_secctx Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-18 14:59 ` [PATCH v35 10/29] LSM: Use lsmblob in security_ipc_getsecid Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-18 14:59 ` [PATCH v35 11/29] LSM: Use lsmblob in security_current_getsecid Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-18 14:59 ` [PATCH v35 12/29] LSM: Use lsmblob in security_inode_getsecid Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-18 14:59 ` [PATCH v35 13/29] LSM: Use lsmblob in security_cred_getsecid Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-18 18:02 ` kernel test robot 2022-04-18 18:02 ` kernel test robot 2022-04-19 0:41 ` kernel test robot 2022-04-19 0:41 ` kernel test robot 2022-04-19 0:51 ` kernel test robot 2022-04-19 0:51 ` kernel test robot 2022-04-18 14:59 ` [PATCH v35 14/29] LSM: Specify which LSM to display Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-18 14:59 ` [PATCH v35 15/29] LSM: Ensure the correct LSM context releaser Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-18 14:59 ` [PATCH v35 16/29] LSM: Use lsmcontext in security_secid_to_secctx Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-18 14:59 ` [PATCH v35 17/29] LSM: Use lsmcontext in security_inode_getsecctx Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-18 14:59 ` [PATCH v35 18/29] LSM: security_secid_to_secctx in netlink netfilter Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-18 14:59 ` [PATCH v35 19/29] NET: Store LSM netlabel data in a lsmblob Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-18 14:59 ` [PATCH v35 20/29] binder: Pass LSM identifier for confirmation Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-18 14:59 ` [PATCH v35 21/29] LSM: Extend security_secid_to_secctx to include module selection Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-25 23:32 ` John Johansen 2022-04-25 23:32 ` John Johansen 2022-04-18 14:59 ` [PATCH v35 22/29] Audit: Keep multiple LSM data in audit_names Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-25 23:32 ` John Johansen 2022-04-25 23:32 ` John Johansen 2022-04-26 17:57 ` Paul Moore 2022-04-26 17:57 ` Paul Moore 2022-04-18 14:59 ` [PATCH v35 23/29] Audit: Create audit_stamp structure Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-25 23:31 ` John Johansen 2022-04-25 23:31 ` John Johansen 2022-04-26 18:03 ` Paul Moore 2022-04-26 18:03 ` Paul Moore 2022-04-26 18:58 ` John Johansen 2022-04-26 18:58 ` John Johansen 2022-04-26 19:18 ` Paul Moore 2022-04-26 19:18 ` Paul Moore 2022-04-27 15:49 ` Casey Schaufler 2022-04-27 15:49 ` Casey Schaufler 2022-04-27 16:02 ` Paul Moore 2022-04-27 16:02 ` Paul Moore 2022-04-27 20:55 ` Casey Schaufler 2022-04-27 20:55 ` Casey Schaufler 2022-04-18 14:59 ` [PATCH v35 24/29] LSM: Add a function to report multiple LSMs Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-22 16:26 ` Paul Moore 2022-04-22 16:26 ` Paul Moore 2022-04-25 23:33 ` John Johansen 2022-04-25 23:33 ` John Johansen 2022-04-18 14:59 ` [PATCH v35 25/29] Audit: Allow multiple records in an audit_buffer Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-22 16:27 ` Paul Moore 2022-04-22 16:27 ` Paul Moore 2022-04-26 1:06 ` John Johansen 2022-04-26 1:06 ` John Johansen 2022-04-26 18:12 ` Paul Moore 2022-04-26 18:12 ` Paul Moore 2022-04-26 19:01 ` John Johansen 2022-04-26 19:01 ` John Johansen 2022-04-18 14:59 ` [PATCH v35 26/29] Audit: Add record for multiple task security contexts Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-22 16:28 ` Paul Moore 2022-04-22 16:28 ` Paul Moore 2022-04-26 1:08 ` John Johansen 2022-04-26 1:08 ` John Johansen 2022-04-26 18:15 ` Paul Moore 2022-04-26 18:15 ` Paul Moore 2022-04-26 19:07 ` John Johansen 2022-04-26 19:07 ` John Johansen 2022-04-18 14:59 ` [PATCH v35 27/29] Audit: Add record for multiple object contexts Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-22 16:29 ` Paul Moore 2022-04-22 16:29 ` Paul Moore 2022-04-26 3:37 ` John Johansen 2022-04-26 3:37 ` John Johansen 2022-04-26 18:57 ` Paul Moore 2022-04-26 18:57 ` Paul Moore 2022-04-26 19:24 ` John Johansen 2022-04-26 19:24 ` John Johansen 2022-04-18 14:59 ` [PATCH v35 28/29] LSM: Add /proc attr entry for full LSM context Casey Schaufler 2022-04-18 14:59 ` Casey Schaufler 2022-04-22 8:37 ` John Johansen 2022-04-22 8:37 ` John Johansen 2022-04-18 14:59 ` [PATCH v35 29/29] AppArmor: Remove the exclusive flag Casey Schaufler 2022-04-18 14:59 ` 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=20220418145945.38797-8-casey@schaufler-ca.com \ --to=casey@schaufler-ca.com \ --cc=casey.schaufler@intel.com \ --cc=jmorris@namei.org \ --cc=john.johansen@canonical.com \ --cc=linux-audit@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-security-module@vger.kernel.org \ --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.