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, keescook@chromium.org,
john.johansen@canonical.com, penguin-kernel@i-love.sakura.ne.jp,
paul@paul-moore.com, sds@tycho.nsa.gov
Subject: [PATCH 05/27] LSM: Use lsmblob in security_kernel_act_as
Date: Fri, 26 Jul 2019 16:39:01 -0700 [thread overview]
Message-ID: <20190726233923.2570-6-casey@schaufler-ca.com> (raw)
In-Reply-To: <20190726233923.2570-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 it's 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.
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.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 efb6edf32de7..9a21c376ed97 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -22,6 +22,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 4f8b478bc3a1..313e45a3cac3 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -388,7 +388,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);
@@ -971,7 +971,8 @@ static inline void security_transfer_creds(struct cred *new,
{
}
-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 45d77284aed0..71c14dda107e 100644
--- a/kernel/cred.c
+++ b/kernel/cred.c
@@ -701,14 +701,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);
@@ -724,6 +724,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;
@@ -731,7 +732,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 fa6e425e6f29..fa7ab1334f22 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1627,9 +1627,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.20.1
next prev parent reply other threads:[~2019-07-26 23:39 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-26 23:38 [PATCH v5 00/27] LSM: Module stacking for AppArmor Casey Schaufler
2019-07-26 23:38 ` [PATCH 01/27] LSM: Infrastructure management of the sock security Casey Schaufler
2019-07-26 23:38 ` [PATCH 02/27] LSM: Infrastructure management of the key blob Casey Schaufler
2019-07-26 23:38 ` [PATCH 03/27] LSM: Create and manage the lsmblob data structure Casey Schaufler
2019-07-26 23:39 ` [PATCH 04/27] LSM: Use lsmblob in security_audit_rule_match Casey Schaufler
2019-07-26 23:39 ` Casey Schaufler [this message]
2019-07-26 23:39 ` [PATCH 06/27] net: Prepare UDS for security module stacking Casey Schaufler
2019-07-26 23:39 ` [PATCH 07/27] LSM: Use lsmblob in security_secctx_to_secid Casey Schaufler
2019-07-26 23:39 ` [PATCH 08/27] LSM: Use lsmblob in security_secid_to_secctx Casey Schaufler
2019-07-26 23:39 ` [PATCH 09/27] LSM: Use lsmblob in security_ipc_getsecid Casey Schaufler
2019-07-26 23:39 ` [PATCH 10/27] LSM: Use lsmblob in security_task_getsecid Casey Schaufler
2019-07-26 23:39 ` [PATCH 11/27] LSM: Use lsmblob in security_inode_getsecid Casey Schaufler
2019-07-26 23:39 ` [PATCH 12/27] LSM: Use lsmblob in security_cred_getsecid Casey Schaufler
2019-07-26 23:39 ` [PATCH 13/27] IMA: Change internal interfaces to use lsmblobs Casey Schaufler
2019-07-26 23:39 ` [PATCH 14/27] LSM: Specify which LSM to display Casey Schaufler
2019-07-29 17:05 ` Kees Cook
2019-07-26 23:39 ` [PATCH 15/27] LSM: Ensure the correct LSM context releaser Casey Schaufler
2019-07-26 23:39 ` [PATCH 16/27] LSM: Use lsmcontext in security_secid_to_secctx Casey Schaufler
2019-07-26 23:39 ` [PATCH 17/27] LSM: Use lsmcontext in security_dentry_init_security Casey Schaufler
2019-07-26 23:39 ` [PATCH 18/27] LSM: Use lsmcontext in security_inode_getsecctx Casey Schaufler
2019-07-26 23:39 ` [PATCH 19/27] LSM: security_secid_to_secctx in netlink netfilter Casey Schaufler
2019-07-26 23:39 ` [PATCH 20/27] NET: Store LSM netlabel data in a lsmblob Casey Schaufler
2019-07-26 23:39 ` [PATCH 21/27] SELinux: Verify LSM display sanity in binder Casey Schaufler
2019-07-26 23:39 ` [PATCH 22/27] Audit: Add subj_LSM fields when necessary Casey Schaufler
2019-07-26 23:39 ` [PATCH 23/27] Audit: Include object data for all security modules Casey Schaufler
2019-07-26 23:39 ` [PATCH 24/27] LSM: Provide an user space interface for the default display Casey Schaufler
2019-07-29 17:15 ` Kees Cook
2019-07-26 23:39 ` [PATCH 25/27] NET: Add SO_PEERCONTEXT for multiple LSMs Casey Schaufler
2019-07-29 13:00 ` Simon McVittie
2019-07-29 15:04 ` Casey Schaufler
2019-07-26 23:39 ` [PATCH 26/27] LSM: Add /proc attr entry for full LSM context Casey Schaufler
2019-07-29 17:19 ` Kees Cook
2019-07-29 19:22 ` Casey Schaufler
2019-07-29 21:40 ` Kees Cook
2019-07-26 23:39 ` [PATCH 27/27] AppArmor: Remove the exclusive flag 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=20190726233923.2570-6-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-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: 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).