Message ID | 20191216223621.5127-11-casey@schaufler-ca.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [v12,01/25] LSM: Infrastructure management of the sock security | expand |
On 12/16/19 5:36 PM, Casey Schaufler wrote: > Change the security_inode_getsecid() interface to fill in a > lsmblob structure instead of a u32 secid. This allows for its > callers to gather data from all registered LSMs. Data is provided > for IMA and audit. > > Reviewed-by: Kees Cook <keescook@chromium.org> > Reviewed-by: John Johansen <john.johansen@canonical.com> > Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> > cc: linux-integrity@vger.kernel.org Did it get an ack from linux-integrity? Otherwise, Acked-by: Stephen Smalley <sds@tycho.nsa.gov> > --- > include/linux/security.h | 7 ++++--- > kernel/auditsc.c | 6 +++++- > security/integrity/ima/ima_policy.c | 4 +--- > security/security.c | 11 +++++++++-- > 4 files changed, 19 insertions(+), 9 deletions(-) > > diff --git a/include/linux/security.h b/include/linux/security.h > index b6d5475f8196..e0acc09a79fe 100644 > --- a/include/linux/security.h > +++ b/include/linux/security.h > @@ -409,7 +409,7 @@ int security_inode_killpriv(struct dentry *dentry); > int security_inode_getsecurity(struct inode *inode, const char *name, void **buffer, bool alloc); > int security_inode_setsecurity(struct inode *inode, const char *name, const void *value, size_t size, int flags); > int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer_size); > -void security_inode_getsecid(struct inode *inode, u32 *secid); > +void security_inode_getsecid(struct inode *inode, struct lsmblob *blob); > int security_inode_copy_up(struct dentry *src, struct cred **new); > int security_inode_copy_up_xattr(const char *name); > int security_kernfs_init_security(struct kernfs_node *kn_dir, > @@ -924,9 +924,10 @@ static inline int security_inode_listsecurity(struct inode *inode, char *buffer, > return 0; > } > > -static inline void security_inode_getsecid(struct inode *inode, u32 *secid) > +static inline void security_inode_getsecid(struct inode *inode, > + struct lsmblob *blob) > { > - *secid = 0; > + lsmblob_init(blob, 0); > } > > static inline int security_inode_copy_up(struct dentry *src, struct cred **new) > diff --git a/kernel/auditsc.c b/kernel/auditsc.c > index cccb681ad081..5752e51883d5 100644 > --- a/kernel/auditsc.c > +++ b/kernel/auditsc.c > @@ -1931,13 +1931,17 @@ static void audit_copy_inode(struct audit_names *name, > const struct dentry *dentry, > struct inode *inode, unsigned int flags) > { > + struct lsmblob blob; > + > name->ino = inode->i_ino; > name->dev = inode->i_sb->s_dev; > name->mode = inode->i_mode; > name->uid = inode->i_uid; > name->gid = inode->i_gid; > name->rdev = inode->i_rdev; > - security_inode_getsecid(inode, &name->osid); > + security_inode_getsecid(inode, &blob); > + /* scaffolding until osid is updated */ > + name->osid = blob.secid[0]; > if (flags & AUDIT_INODE_NOEVAL) { > name->fcap_ver = -1; > return; > diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c > index 193ddd55420b..c7d2ea47a326 100644 > --- a/security/integrity/ima/ima_policy.c > +++ b/security/integrity/ima/ima_policy.c > @@ -413,7 +413,6 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode, > return false; > for (i = 0; i < MAX_LSM_RULES; i++) { > int rc = 0; > - u32 osid; > struct lsmblob blob; > > if (!rule->lsm[i].rule) > @@ -423,8 +422,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode, > case LSM_OBJ_USER: > case LSM_OBJ_ROLE: > case LSM_OBJ_TYPE: > - security_inode_getsecid(inode, &osid); > - lsmblob_init(&blob, osid); > + security_inode_getsecid(inode, &blob); > rc = security_filter_rule_match(&blob, > rule->lsm[i].type, > Audit_equal, > diff --git a/security/security.c b/security/security.c > index c42573958630..66322a2a2beb 100644 > --- a/security/security.c > +++ b/security/security.c > @@ -1386,9 +1386,16 @@ int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer > } > EXPORT_SYMBOL(security_inode_listsecurity); > > -void security_inode_getsecid(struct inode *inode, u32 *secid) > +void security_inode_getsecid(struct inode *inode, struct lsmblob *blob) > { > - call_void_hook(inode_getsecid, inode, secid); > + struct security_hook_list *hp; > + > + lsmblob_init(blob, 0); > + hlist_for_each_entry(hp, &security_hook_heads.inode_getsecid, list) { > + if (WARN_ON(hp->lsmid->slot < 0 || hp->lsmid->slot >= lsm_slot)) > + continue; > + hp->hook.inode_getsecid(inode, &blob->secid[hp->lsmid->slot]); > + } > } > > int security_inode_copy_up(struct dentry *src, struct cred **new) >
diff --git a/include/linux/security.h b/include/linux/security.h index b6d5475f8196..e0acc09a79fe 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -409,7 +409,7 @@ int security_inode_killpriv(struct dentry *dentry); int security_inode_getsecurity(struct inode *inode, const char *name, void **buffer, bool alloc); int security_inode_setsecurity(struct inode *inode, const char *name, const void *value, size_t size, int flags); int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer_size); -void security_inode_getsecid(struct inode *inode, u32 *secid); +void security_inode_getsecid(struct inode *inode, struct lsmblob *blob); int security_inode_copy_up(struct dentry *src, struct cred **new); int security_inode_copy_up_xattr(const char *name); int security_kernfs_init_security(struct kernfs_node *kn_dir, @@ -924,9 +924,10 @@ static inline int security_inode_listsecurity(struct inode *inode, char *buffer, return 0; } -static inline void security_inode_getsecid(struct inode *inode, u32 *secid) +static inline void security_inode_getsecid(struct inode *inode, + struct lsmblob *blob) { - *secid = 0; + lsmblob_init(blob, 0); } static inline int security_inode_copy_up(struct dentry *src, struct cred **new) diff --git a/kernel/auditsc.c b/kernel/auditsc.c index cccb681ad081..5752e51883d5 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -1931,13 +1931,17 @@ static void audit_copy_inode(struct audit_names *name, const struct dentry *dentry, struct inode *inode, unsigned int flags) { + struct lsmblob blob; + name->ino = inode->i_ino; name->dev = inode->i_sb->s_dev; name->mode = inode->i_mode; name->uid = inode->i_uid; name->gid = inode->i_gid; name->rdev = inode->i_rdev; - security_inode_getsecid(inode, &name->osid); + security_inode_getsecid(inode, &blob); + /* scaffolding until osid is updated */ + name->osid = blob.secid[0]; if (flags & AUDIT_INODE_NOEVAL) { name->fcap_ver = -1; return; diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 193ddd55420b..c7d2ea47a326 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -413,7 +413,6 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode, return false; for (i = 0; i < MAX_LSM_RULES; i++) { int rc = 0; - u32 osid; struct lsmblob blob; if (!rule->lsm[i].rule) @@ -423,8 +422,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode, case LSM_OBJ_USER: case LSM_OBJ_ROLE: case LSM_OBJ_TYPE: - security_inode_getsecid(inode, &osid); - lsmblob_init(&blob, osid); + security_inode_getsecid(inode, &blob); rc = security_filter_rule_match(&blob, rule->lsm[i].type, Audit_equal, diff --git a/security/security.c b/security/security.c index c42573958630..66322a2a2beb 100644 --- a/security/security.c +++ b/security/security.c @@ -1386,9 +1386,16 @@ int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer } EXPORT_SYMBOL(security_inode_listsecurity); -void security_inode_getsecid(struct inode *inode, u32 *secid) +void security_inode_getsecid(struct inode *inode, struct lsmblob *blob) { - call_void_hook(inode_getsecid, inode, secid); + struct security_hook_list *hp; + + lsmblob_init(blob, 0); + hlist_for_each_entry(hp, &security_hook_heads.inode_getsecid, list) { + if (WARN_ON(hp->lsmid->slot < 0 || hp->lsmid->slot >= lsm_slot)) + continue; + hp->hook.inode_getsecid(inode, &blob->secid[hp->lsmid->slot]); + } } int security_inode_copy_up(struct dentry *src, struct cred **new)