--- v38
+++ v25
@@ -1,151 +1,292 @@
-Change the secid parameter of security_audit_rule_match
-to a lsmblob structure pointer. Pass the entry from the
-lsmblob structure for the approprite slot to the LSM hook.
+Change the security_cred_getsecid() interface to fill in a
+lsmblob instead of a u32 secid. The associated data elements
+in the audit sub-system are changed from a secid to a lsmblob
+to accommodate multiple possible LSM audit users.
-Change the users of security_audit_rule_match to use the
-lsmblob instead of a u32. The scaffolding function lsmblob_init()
-fills the blob with the value of the old secid, ensuring that
-it is available to the appropriate module hook. The sources of
-the secid, security_task_getsecid() and security_inode_getsecid(),
-will be converted to use the blob structure later in the series.
-At the point the use of lsmblob_init() is dropped.
-
+Reviewed-by: Kees Cook <keescook@chromium.org>
+Reviewed-by: John Johansen <john.johansen@canonical.com>
+Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
+Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
-Acked-by: Paul Moore <paul@paul-moore.com>
-Reviewed-by: John Johansen <john.johansen@canonical.com>
+Cc: linux-integrity@vger.kernel.org
Cc: linux-audit@redhat.com
---
- include/linux/security.h | 5 +++--
- kernel/auditfilter.c | 6 ++++--
- kernel/auditsc.c | 16 +++++++++++-----
- security/security.c | 5 +++--
- 4 files changed, 21 insertions(+), 11 deletions(-)
+ include/linux/security.h | 2 +-
+ kernel/audit.c | 25 +++++++----------------
+ kernel/audit.h | 3 ++-
+ kernel/auditsc.c | 33 +++++++++++--------------------
+ security/integrity/ima/ima_main.c | 8 ++++----
+ security/security.c | 12 ++++++++---
+ 6 files changed, 35 insertions(+), 48 deletions(-)
diff --git a/include/linux/security.h b/include/linux/security.h
-index 6ee00f3a10a7..3fe04958f7fb 100644
+index 6fa19899903e..175c8032b636 100644
--- a/include/linux/security.h
+++ b/include/linux/security.h
-@@ -1982,7 +1982,7 @@ static inline int security_key_getsecurity(struct key *key, char **_buffer)
- int security_audit_rule_init(u32 field, u32 op, char *rulestr,
- struct audit_lsm_rules *lsmrules);
- int security_audit_rule_known(struct audit_krule *krule);
--int security_audit_rule_match(u32 secid, u32 field, u32 op,
-+int security_audit_rule_match(struct lsmblob *blob, u32 field, u32 op,
- struct audit_lsm_rules *lsmrules);
- void security_audit_rule_free(struct audit_lsm_rules *lsmrules);
-
-@@ -1999,7 +1999,8 @@ static inline int security_audit_rule_known(struct audit_krule *krule)
- return 0;
- }
-
--static inline int security_audit_rule_match(u32 secid, u32 field, u32 op,
-+static inline int security_audit_rule_match(struct lsmblob *blob,
-+ u32 field, u32 op,
- struct audit_lsm_rules *lsmrules)
- {
- return 0;
-diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
-index de75bd6ad866..15cd4fe35e9c 100644
---- a/kernel/auditfilter.c
-+++ b/kernel/auditfilter.c
-@@ -1337,6 +1337,7 @@ int audit_filter(int msgtype, unsigned int listtype)
-
- for (i = 0; i < e->rule.field_count; i++) {
- struct audit_field *f = &e->rule.fields[i];
-+ struct lsmblob blob;
- pid_t pid;
- u32 sid;
-
-@@ -1369,8 +1370,9 @@ int audit_filter(int msgtype, unsigned int listtype)
- case AUDIT_SUBJ_CLR:
- if (f->lsm_str) {
- security_current_getsecid_subj(&sid);
-- result = security_audit_rule_match(sid,
-- f->type, f->op,
-+ lsmblob_init(&blob, sid);
-+ result = security_audit_rule_match(
-+ &blob, f->type, f->op,
- &f->lsm_rules);
- }
- break;
+@@ -479,7 +479,7 @@ int security_cred_alloc_blank(struct cred *cred, gfp_t gfp);
+ 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);
++void security_cred_getsecid(const struct cred *c, struct lsmblob *blob);
+ 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);
+diff --git a/kernel/audit.c b/kernel/audit.c
+index 70df7ac1b357..c06133104695 100644
+--- a/kernel/audit.c
++++ b/kernel/audit.c
+@@ -125,7 +125,7 @@ static u32 audit_backlog_wait_time = AUDIT_BACKLOG_WAIT_TIME;
+ /* The identity of the user shutting down the audit system. */
+ static kuid_t audit_sig_uid = INVALID_UID;
+ static pid_t audit_sig_pid = -1;
+-static u32 audit_sig_sid;
++struct lsmblob audit_sig_lsm;
+
+ /* Records can be lost in several ways:
+ 0) [suppressed in audit_alloc]
+@@ -1441,29 +1441,21 @@ static int audit_receive_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
+ }
+ case AUDIT_SIGNAL_INFO:
+ len = 0;
+- if (audit_sig_sid) {
+- struct lsmblob blob;
+-
+- /*
+- * lsmblob_init sets all values in the lsmblob
+- * to audit_sig_sid. This is temporary until
+- * audit_sig_sid is converted to a lsmblob, which
+- * happens later in this patch set.
+- */
+- lsmblob_init(&blob, audit_sig_sid);
+- err = security_secid_to_secctx(&blob, &ctx, &len);
++ if (lsmblob_is_set(&audit_sig_lsm)) {
++ err = security_secid_to_secctx(&audit_sig_lsm, &ctx,
++ &len);
+ if (err)
+ return err;
+ }
+ sig_data = kmalloc(sizeof(*sig_data) + len, GFP_KERNEL);
+ if (!sig_data) {
+- if (audit_sig_sid)
++ if (lsmblob_is_set(&audit_sig_lsm))
+ security_release_secctx(ctx, len);
+ return -ENOMEM;
+ }
+ sig_data->uid = from_kuid(&init_user_ns, audit_sig_uid);
+ sig_data->pid = audit_sig_pid;
+- if (audit_sig_sid) {
++ if (lsmblob_is_set(&audit_sig_lsm)) {
+ memcpy(sig_data->ctx, ctx, len);
+ security_release_secctx(ctx, len);
+ }
+@@ -2352,7 +2344,6 @@ int audit_set_loginuid(kuid_t loginuid)
+ int audit_signal_info(int sig, struct task_struct *t)
+ {
+ kuid_t uid = current_uid(), auid;
+- struct lsmblob blob;
+
+ if (auditd_test_task(t) &&
+ (sig == SIGTERM || sig == SIGHUP ||
+@@ -2363,9 +2354,7 @@ int audit_signal_info(int sig, struct task_struct *t)
+ audit_sig_uid = auid;
+ else
+ audit_sig_uid = uid;
+- security_task_getsecid(current, &blob);
+- /* scaffolding until audit_sig_sid is converted */
+- audit_sig_sid = blob.secid[0];
++ security_task_getsecid(current, &audit_sig_lsm);
+ }
+
+ return audit_signal_info_syscall(t);
+diff --git a/kernel/audit.h b/kernel/audit.h
+index 3b9c0945225a..ce41886807bb 100644
+--- a/kernel/audit.h
++++ b/kernel/audit.h
+@@ -9,6 +9,7 @@
+ #include <linux/fs.h>
+ #include <linux/audit.h>
+ #include <linux/skbuff.h>
++#include <linux/security.h>
+ #include <uapi/linux/mqueue.h>
+ #include <linux/tty.h>
+
+@@ -134,7 +135,7 @@ struct audit_context {
+ kuid_t target_auid;
+ kuid_t target_uid;
+ unsigned int target_sessionid;
+- u32 target_sid;
++ struct lsmblob target_lsm;
+ char target_comm[TASK_COMM_LEN];
+
+ struct audit_tree_refs *trees, *first_trees;
diff --git a/kernel/auditsc.c b/kernel/auditsc.c
-index 482805f6ea68..5fab2367bfd0 100644
+index 59cb2c4ad149..768989b2f09e 100644
--- a/kernel/auditsc.c
+++ b/kernel/auditsc.c
-@@ -468,6 +468,7 @@ static int audit_filter_rules(struct task_struct *tsk,
- const struct cred *cred;
- int i, need_sid = 1;
- u32 sid;
-+ struct lsmblob blob;
- unsigned int sessionid;
-
- if (ctx && rule->prio <= ctx->prio)
-@@ -678,8 +679,10 @@ static int audit_filter_rules(struct task_struct *tsk,
- security_current_getsecid_subj(&sid);
- need_sid = 0;
- }
-- result = security_audit_rule_match(sid, f->type,
-- f->op, &f->lsm_rules);
-+ lsmblob_init(&blob, sid);
-+ result = security_audit_rule_match(&blob,
-+ f->type, f->op,
-+ &f->lsm_rules);
- }
- break;
- case AUDIT_OBJ_USER:
-@@ -692,15 +695,17 @@ static int audit_filter_rules(struct task_struct *tsk,
- if (f->lsm_str) {
- /* Find files that match */
- if (name) {
-+ lsmblob_init(&blob, name->osid);
- result = security_audit_rule_match(
-- name->osid,
-+ &blob,
- f->type,
- f->op,
- &f->lsm_rules);
- } else if (ctx) {
- list_for_each_entry(n, &ctx->names_list, list) {
-+ lsmblob_init(&blob, n->osid);
- if (security_audit_rule_match(
-- n->osid, f->type, f->op,
-+ &blob, f->type, f->op,
- &f->lsm_rules)) {
- ++result;
- break;
-@@ -710,7 +715,8 @@ static int audit_filter_rules(struct task_struct *tsk,
- /* Find ipc objects that match */
- if (!ctx || ctx->type != AUDIT_IPC)
- break;
-- if (security_audit_rule_match(ctx->ipc.osid,
-+ lsmblob_init(&blob, ctx->ipc.osid);
-+ if (security_audit_rule_match(&blob,
- f->type, f->op,
- &f->lsm_rules))
- ++result;
+@@ -111,7 +111,7 @@ struct audit_aux_data_pids {
+ kuid_t target_auid[AUDIT_AUX_PIDS];
+ kuid_t target_uid[AUDIT_AUX_PIDS];
+ unsigned int target_sessionid[AUDIT_AUX_PIDS];
+- u32 target_sid[AUDIT_AUX_PIDS];
++ struct lsmblob target_lsm[AUDIT_AUX_PIDS];
+ char target_comm[AUDIT_AUX_PIDS][TASK_COMM_LEN];
+ int pid_count;
+ };
+@@ -993,14 +993,14 @@ static inline void audit_free_context(struct audit_context *context)
+ }
+
+ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
+- kuid_t auid, kuid_t uid, unsigned int sessionid,
+- u32 sid, char *comm)
++ kuid_t auid, kuid_t uid,
++ unsigned int sessionid,
++ struct lsmblob *blob, char *comm)
+ {
+ struct audit_buffer *ab;
+ char *ctx = NULL;
+ u32 len;
+ int rc = 0;
+- struct lsmblob blob;
+
+ ab = audit_log_start(context, GFP_KERNEL, AUDIT_OBJ_PID);
+ if (!ab)
+@@ -1009,9 +1009,8 @@ static int audit_log_pid_context(struct audit_context *context, pid_t pid,
+ audit_log_format(ab, "opid=%d oauid=%d ouid=%d oses=%d", pid,
+ from_kuid(&init_user_ns, auid),
+ from_kuid(&init_user_ns, uid), sessionid);
+- if (sid) {
+- lsmblob_init(&blob, sid);
+- if (security_secid_to_secctx(&blob, &ctx, &len)) {
++ if (lsmblob_is_set(blob)) {
++ if (security_secid_to_secctx(blob, &ctx, &len)) {
+ audit_log_format(ab, " obj=(none)");
+ rc = 1;
+ } else {
+@@ -1582,7 +1581,7 @@ static void audit_log_exit(void)
+ axs->target_auid[i],
+ axs->target_uid[i],
+ axs->target_sessionid[i],
+- axs->target_sid[i],
++ &axs->target_lsm[i],
+ axs->target_comm[i]))
+ call_panic = 1;
+ }
+@@ -1591,7 +1590,7 @@ static void audit_log_exit(void)
+ audit_log_pid_context(context, context->target_pid,
+ context->target_auid, context->target_uid,
+ context->target_sessionid,
+- context->target_sid, context->target_comm))
++ &context->target_lsm, context->target_comm))
+ call_panic = 1;
+
+ if (context->pwd.dentry && context->pwd.mnt) {
+@@ -1769,7 +1768,7 @@ void __audit_syscall_exit(int success, long return_code)
+ context->aux = NULL;
+ context->aux_pids = NULL;
+ context->target_pid = 0;
+- context->target_sid = 0;
++ lsmblob_init(&context->target_lsm, 0);
+ context->sockaddr_len = 0;
+ context->type = 0;
+ context->fds[0] = -1;
+@@ -2421,15 +2420,12 @@ int __audit_sockaddr(int len, void *a)
+ void __audit_ptrace(struct task_struct *t)
+ {
+ struct audit_context *context = audit_context();
+- struct lsmblob blob;
+
+ context->target_pid = task_tgid_nr(t);
+ context->target_auid = audit_get_loginuid(t);
+ context->target_uid = task_uid(t);
+ context->target_sessionid = audit_get_sessionid(t);
+- security_task_getsecid(t, &blob);
+- /* scaffolding - until target_sid is converted */
+- context->target_sid = blob.secid[0];
++ security_task_getsecid(t, &context->target_lsm);
+ memcpy(context->target_comm, t->comm, TASK_COMM_LEN);
+ }
+
+@@ -2445,7 +2441,6 @@ int audit_signal_info_syscall(struct task_struct *t)
+ struct audit_aux_data_pids *axp;
+ struct audit_context *ctx = audit_context();
+ kuid_t t_uid = task_uid(t);
+- struct lsmblob blob;
+
+ if (!audit_signals || audit_dummy_context())
+ return 0;
+@@ -2457,9 +2452,7 @@ int audit_signal_info_syscall(struct task_struct *t)
+ ctx->target_auid = audit_get_loginuid(t);
+ ctx->target_uid = t_uid;
+ ctx->target_sessionid = audit_get_sessionid(t);
+- security_task_getsecid(t, &blob);
+- /* scaffolding until target_sid is converted */
+- ctx->target_sid = blob.secid[0];
++ security_task_getsecid(t, &ctx->target_lsm);
+ memcpy(ctx->target_comm, t->comm, TASK_COMM_LEN);
+ return 0;
+ }
+@@ -2480,9 +2473,7 @@ int audit_signal_info_syscall(struct task_struct *t)
+ axp->target_auid[axp->pid_count] = audit_get_loginuid(t);
+ axp->target_uid[axp->pid_count] = t_uid;
+ axp->target_sessionid[axp->pid_count] = audit_get_sessionid(t);
+- security_task_getsecid(t, &blob);
+- /* scaffolding until target_sid is converted */
+- axp->target_sid[axp->pid_count] = blob.secid[0];
++ security_task_getsecid(t, &axp->target_lsm[axp->pid_count]);
+ memcpy(axp->target_comm[axp->pid_count], t->comm, TASK_COMM_LEN);
+ axp->pid_count++;
+
+diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
+index 360c5e3760cc..5a6ba57beef3 100644
+--- a/security/integrity/ima/ima_main.c
++++ b/security/integrity/ima/ima_main.c
+@@ -470,7 +470,6 @@ int ima_file_mprotect(struct vm_area_struct *vma, unsigned long prot)
+ int ima_bprm_check(struct linux_binprm *bprm)
+ {
+ int ret;
+- u32 secid;
+ struct lsmblob blob;
+
+ security_task_getsecid(current, &blob);
+@@ -480,9 +479,10 @@ int ima_bprm_check(struct linux_binprm *bprm)
+ if (ret)
+ return ret;
+
+- security_cred_getsecid(bprm->cred, &secid);
+- return process_measurement(bprm->file, bprm->cred, secid, NULL, 0,
+- MAY_EXEC, CREDS_CHECK);
++ security_cred_getsecid(bprm->cred, &blob);
++ /* scaffolding until process_measurement changes */
++ return process_measurement(bprm->file, bprm->cred, blob.secid[0],
++ NULL, 0, MAY_EXEC, CREDS_CHECK);
+ }
+
+ /**
diff --git a/security/security.c b/security/security.c
-index b74debe82d82..96faeff2c73b 100644
+index 54bca6d52ab7..0d9a4b50f252 100644
--- a/security/security.c
+++ b/security/security.c
-@@ -2720,7 +2720,7 @@ void security_audit_rule_free(struct audit_lsm_rules *lsmrules)
- }
- }
-
--int security_audit_rule_match(u32 secid, u32 field, u32 op,
-+int security_audit_rule_match(struct lsmblob *blob, u32 field, u32 op,
- struct audit_lsm_rules *lsmrules)
- {
- struct security_hook_list *hp;
-@@ -2731,7 +2731,8 @@ int security_audit_rule_match(u32 secid, u32 field, u32 op,
- continue;
- if (lsmrules->rule[hp->lsmid->slot] == NULL)
- continue;
-- rc = hp->hook.audit_rule_match(secid, field, op,
-+ rc = hp->hook.audit_rule_match(blob->secid[hp->lsmid->slot],
-+ field, op,
- &lsmrules->rule[hp->lsmid->slot]);
- if (rc)
- return rc;
+@@ -1752,10 +1752,16 @@ void security_transfer_creds(struct cred *new, const struct cred *old)
+ call_void_hook(cred_transfer, new, old);
+ }
+
+-void security_cred_getsecid(const struct cred *c, u32 *secid)
++void security_cred_getsecid(const struct cred *c, struct lsmblob *blob)
+ {
+- *secid = 0;
+- call_void_hook(cred_getsecid, c, secid);
++ struct security_hook_list *hp;
++
++ lsmblob_init(blob, 0);
++ hlist_for_each_entry(hp, &security_hook_heads.cred_getsecid, list) {
++ if (WARN_ON(hp->lsmid->slot < 0 || hp->lsmid->slot >= lsm_slot))
++ continue;
++ hp->hook.cred_getsecid(c, &blob->secid[hp->lsmid->slot]);
++ }
+ }
+ EXPORT_SYMBOL(security_cred_getsecid);
+
--
-2.37.3
+2.29.2