From: Casey Schaufler Subject: [PATCH v11 03/25] LSM: Use lsmblob in security_audit_rule_match Date: Tue, 19 Nov 2019 10:03:05 -0800 Message-ID: <20191119180315.12254-2-casey@schaufler-ca.com> References: <20191119180315.12254-1-casey@schaufler-ca.com> Mime-Version: 1.0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Return-path: Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D31D910BBCC2 for ; Tue, 19 Nov 2019 18:03:24 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 553ED800151 for ; Tue, 19 Nov 2019 18:03:24 +0000 (UTC) In-Reply-To: <20191119180315.12254-1-casey@schaufler-ca.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-audit-bounces@redhat.com Errors-To: linux-audit-bounces@redhat.com To: linux-audit@redhat.com List-Id: linux-audit@redhat.com 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 users of security_audit_rule_match to use the lsmblob instead of a u32. In some cases this requires a temporary conversion using lsmblob_init() that will go away when other interfaces get converted. Reviewed-by: Kees Cook Reviewed-by: John Johansen Signed-off-by: Casey Schaufler --- include/linux/security.h | 7 ++++--- kernel/auditfilter.c | 7 +++++-- kernel/auditsc.c | 14 ++++++++++---- security/integrity/ima/ima.h | 4 ++-- security/integrity/ima/ima_policy.c | 7 +++++-- security/security.c | 18 +++++++++++++++--- 6 files changed, 41 insertions(+), 16 deletions(-) diff --git a/include/linux/security.h b/include/linux/security.h index 5eced28fa0c9..2df58448f1f2 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -1835,7 +1835,8 @@ static inline int security_key_getsecurity(struct key= *key, char **_buffer) #ifdef CONFIG_SECURITY int security_audit_rule_init(u32 field, u32 op, char *rulestr, void **lsmr= ule); int security_audit_rule_known(struct audit_krule *krule); -int security_audit_rule_match(u32 secid, u32 field, u32 op, void *lsmrule)= ; +int security_audit_rule_match(struct lsmblob *blob, u32 field, u32 op, +=09=09=09 void *lsmrule); void security_audit_rule_free(void *lsmrule); =20 #else @@ -1851,8 +1852,8 @@ static inline int security_audit_rule_known(struct au= dit_krule *krule) =09return 0; } =20 -static inline int security_audit_rule_match(u32 secid, u32 field, u32 op, -=09=09=09=09=09 void *lsmrule) +static inline int security_audit_rule_match(struct lsmblob *blob, u32 fiel= d, +=09=09=09=09=09 u32 op, void *lsmrule) { =09return 0; } diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index b0126e9c0743..356db1dd276c 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c @@ -1325,6 +1325,7 @@ int audit_filter(int msgtype, unsigned int listtype) =09=09=09struct audit_field *f =3D &e->rule.fields[i]; =09=09=09pid_t pid; =09=09=09u32 sid; +=09=09=09struct lsmblob blob; =20 =09=09=09switch (f->type) { =09=09=09case AUDIT_PID: @@ -1355,8 +1356,10 @@ int audit_filter(int msgtype, unsigned int listtype) =09=09=09case AUDIT_SUBJ_CLR: =09=09=09=09if (f->lsm_rule) { =09=09=09=09=09security_task_getsecid(current, &sid); -=09=09=09=09=09result =3D security_audit_rule_match(sid, -=09=09=09=09=09=09 f->type, f->op, f->lsm_rule); +=09=09=09=09=09lsmblob_init(&blob, sid); +=09=09=09=09=09result =3D security_audit_rule_match( +=09=09=09=09=09=09=09&blob, f->type, +=09=09=09=09=09=09=09f->op, f->lsm_rule); =09=09=09=09} =09=09=09=09break; =09=09=09case AUDIT_EXE: diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 4effe01ebbe2..7566e5b1c419 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -445,6 +445,7 @@ static int audit_filter_rules(struct task_struct *tsk, =09const struct cred *cred; =09int i, need_sid =3D 1; =09u32 sid; +=09struct lsmblob blob; =09unsigned int sessionid; =20 =09cred =3D rcu_dereference_check(tsk->cred, tsk =3D=3D current || task_cr= eation); @@ -643,7 +644,9 @@ static int audit_filter_rules(struct task_struct *tsk, =09=09=09=09=09security_task_getsecid(tsk, &sid); =09=09=09=09=09need_sid =3D 0; =09=09=09=09} -=09=09=09=09result =3D security_audit_rule_match(sid, f->type, +=09=09=09=09lsmblob_init(&blob, sid); +=09=09=09=09result =3D security_audit_rule_match(&blob, +=09=09=09=09=09=09=09=09 f->type, =09=09=09=09=09=09=09=09 f->op, =09=09=09=09=09=09=09=09 f->lsm_rule); =09=09=09} @@ -658,15 +661,17 @@ static int audit_filter_rules(struct task_struct *tsk= , =09=09=09if (f->lsm_rule) { =09=09=09=09/* Find files that match */ =09=09=09=09if (name) { +=09=09=09=09=09lsmblob_init(&blob, name->osid); =09=09=09=09=09result =3D security_audit_rule_match( -=09=09=09=09=09=09=09=09name->osid, +=09=09=09=09=09=09=09=09&blob, =09=09=09=09=09=09=09=09f->type, =09=09=09=09=09=09=09=09f->op, =09=09=09=09=09=09=09=09f->lsm_rule); =09=09=09=09} else if (ctx) { =09=09=09=09=09list_for_each_entry(n, &ctx->names_list, list) { +=09=09=09=09=09=09lsmblob_init(&blob, n->osid); =09=09=09=09=09=09if (security_audit_rule_match( -=09=09=09=09=09=09=09=09n->osid, +=09=09=09=09=09=09=09=09&blob, =09=09=09=09=09=09=09=09f->type, =09=09=09=09=09=09=09=09f->op, =09=09=09=09=09=09=09=09f->lsm_rule)) { @@ -678,7 +683,8 @@ static int audit_filter_rules(struct task_struct *tsk, =09=09=09=09/* Find ipc objects that match */ =09=09=09=09if (!ctx || ctx->type !=3D AUDIT_IPC) =09=09=09=09=09break; -=09=09=09=09if (security_audit_rule_match(ctx->ipc.osid, +=09=09=09=09lsmblob_init(&blob, ctx->ipc.osid); +=09=09=09=09if (security_audit_rule_match(&blob, =09=09=09=09=09=09=09 f->type, f->op, =09=09=09=09=09=09=09 f->lsm_rule)) =09=09=09=09=09++result; diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index 3689081aaf38..5bcd6011ef8c 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h @@ -370,8 +370,8 @@ static inline int security_filter_rule_init(u32 field, = u32 op, char *rulestr, =09return -EINVAL; } =20 -static inline int security_filter_rule_match(u32 secid, u32 field, u32 op, -=09=09=09=09=09 void *lsmrule) +static inline int security_filter_rule_match(struct lsmblob *blob, u32 fie= ld, +=09=09=09=09=09 u32 op, void *lsmrule) { =09return -EINVAL; } diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/i= ma_policy.c index 5380aca2b351..7711cc6a3fe3 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -414,6 +414,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule= , struct inode *inode, =09for (i =3D 0; i < MAX_LSM_RULES; i++) { =09=09int rc =3D 0; =09=09u32 osid; +=09=09struct lsmblob blob; =20 =09=09if (!rule->lsm[i].rule) =09=09=09continue; @@ -423,7 +424,8 @@ static bool ima_match_rules(struct ima_rule_entry *rule= , struct inode *inode, =09=09case LSM_OBJ_ROLE: =09=09case LSM_OBJ_TYPE: =09=09=09security_inode_getsecid(inode, &osid); -=09=09=09rc =3D security_filter_rule_match(osid, +=09=09=09lsmblob_init(&blob, osid); +=09=09=09rc =3D security_filter_rule_match(&blob, =09=09=09=09=09=09=09rule->lsm[i].type, =09=09=09=09=09=09=09Audit_equal, =09=09=09=09=09=09=09rule->lsm[i].rule); @@ -431,7 +433,8 @@ static bool ima_match_rules(struct ima_rule_entry *rule= , struct inode *inode, =09=09case LSM_SUBJ_USER: =09=09case LSM_SUBJ_ROLE: =09=09case LSM_SUBJ_TYPE: -=09=09=09rc =3D security_filter_rule_match(secid, +=09=09=09lsmblob_init(&blob, secid); +=09=09=09rc =3D security_filter_rule_match(&blob, =09=09=09=09=09=09=09rule->lsm[i].type, =09=09=09=09=09=09=09Audit_equal, =09=09=09=09=09=09=09rule->lsm[i].rule); diff --git a/security/security.c b/security/security.c index 5f503cadf7f3..7c386cbe4cf3 100644 --- a/security/security.c +++ b/security/security.c @@ -439,7 +439,7 @@ static int lsm_append(const char *new, char **result) /* * Current index to use while initializing the lsmblob secid list. */ -static int lsm_slot __initdata; +static int lsm_slot __lsm_ro_after_init; =20 /** * security_add_hooks - Add a modules hooks to the hook lists. @@ -2412,9 +2412,21 @@ void security_audit_rule_free(void *lsmrule) =09call_void_hook(audit_rule_free, lsmrule); } =20 -int security_audit_rule_match(u32 secid, u32 field, u32 op, void *lsmrule) +int security_audit_rule_match(struct lsmblob *blob, u32 field, u32 op, +=09=09=09 void *lsmrule) { -=09return call_int_hook(audit_rule_match, 0, secid, field, op, lsmrule); +=09struct security_hook_list *hp; +=09int rc; + +=09hlist_for_each_entry(hp, &security_hook_heads.audit_rule_match, list) { +=09=09if (WARN_ON(hp->lsmid->slot < 0 || hp->lsmid->slot >=3D lsm_slot)) +=09=09=09continue; +=09=09rc =3D hp->hook.audit_rule_match(blob->secid[hp->lsmid->slot], +=09=09=09=09=09 field, op, lsmrule); +=09=09if (rc !=3D 0) +=09=09=09return rc; +=09} +=09return 0; } #endif /* CONFIG_AUDIT */ =20 --=20 2.20.1