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, sds@tycho.nsa.gov, linux-kernel@vger.kernel.org, linux-integrity@vger.kernel.org Subject: [PATCH v28 11/25] LSM: Use lsmblob in security_inode_getsecid Date: Wed, 21 Jul 2021 17:47:44 -0700 [thread overview] Message-ID: <20210722004758.12371-12-casey@schaufler-ca.com> (raw) In-Reply-To: <20210722004758.12371-1-casey@schaufler-ca.com> 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> 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> Cc: linux-integrity@vger.kernel.org Cc: linux-audit@redhat.com --- 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 4070cef152f7..aa19fa4a553f 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -454,7 +454,7 @@ int security_inode_getsecurity(struct user_namespace *mnt_userns, 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, @@ -1005,9 +1005,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 50e3f2f4cb49..dcd1b988a2d3 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -1975,13 +1975,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 af612a42eebe..6d112ec89c1b 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -608,7 +608,6 @@ static bool ima_match_rules(struct ima_rule_entry *rule, return false; for (i = 0; i < MAX_LSM_RULES; i++) { int rc = 0; - u32 osid; struct lsmblob lsmdata; if (!ima_lsm_isset(rule, i)) { @@ -621,8 +620,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule, case LSM_OBJ_USER: case LSM_OBJ_ROLE: case LSM_OBJ_TYPE: - security_inode_getsecid(inode, &osid); - lsmblob_init(&lsmdata, osid); + security_inode_getsecid(inode, &lsmdata); rc = ima_filter_rule_match(&lsmdata, rule->lsm[i].type, Audit_equal, rule->lsm[i].rule); diff --git a/security/security.c b/security/security.c index 458fded340ab..da85932a4d53 100644 --- a/security/security.c +++ b/security/security.c @@ -1548,9 +1548,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) -- 2.31.1
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: john.johansen@canonical.com, linux-kernel@vger.kernel.org, linux-audit@redhat.com, linux-integrity@vger.kernel.org, sds@tycho.nsa.gov Subject: [PATCH v28 11/25] LSM: Use lsmblob in security_inode_getsecid Date: Wed, 21 Jul 2021 17:47:44 -0700 [thread overview] Message-ID: <20210722004758.12371-12-casey@schaufler-ca.com> (raw) In-Reply-To: <20210722004758.12371-1-casey@schaufler-ca.com> 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> 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> Cc: linux-integrity@vger.kernel.org Cc: linux-audit@redhat.com --- 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 4070cef152f7..aa19fa4a553f 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -454,7 +454,7 @@ int security_inode_getsecurity(struct user_namespace *mnt_userns, 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, @@ -1005,9 +1005,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 50e3f2f4cb49..dcd1b988a2d3 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -1975,13 +1975,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 af612a42eebe..6d112ec89c1b 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c @@ -608,7 +608,6 @@ static bool ima_match_rules(struct ima_rule_entry *rule, return false; for (i = 0; i < MAX_LSM_RULES; i++) { int rc = 0; - u32 osid; struct lsmblob lsmdata; if (!ima_lsm_isset(rule, i)) { @@ -621,8 +620,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule, case LSM_OBJ_USER: case LSM_OBJ_ROLE: case LSM_OBJ_TYPE: - security_inode_getsecid(inode, &osid); - lsmblob_init(&lsmdata, osid); + security_inode_getsecid(inode, &lsmdata); rc = ima_filter_rule_match(&lsmdata, rule->lsm[i].type, Audit_equal, rule->lsm[i].rule); diff --git a/security/security.c b/security/security.c index 458fded340ab..da85932a4d53 100644 --- a/security/security.c +++ b/security/security.c @@ -1548,9 +1548,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) -- 2.31.1 -- Linux-audit mailing list Linux-audit@redhat.com https://listman.redhat.com/mailman/listinfo/linux-audit
next prev parent reply other threads:[~2021-07-22 1:00 UTC|newest] Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top [not found] <20210722004758.12371-1-casey.ref@schaufler-ca.com> 2021-07-22 0:47 ` [PATCH v28 00/25] LSM: Module stacking for AppArmor Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 01/25] LSM: Infrastructure management of the sock security Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 02/25] LSM: Add the lsmblob data structure Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 03/25] LSM: provide lsm name and id slot mappings Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 04/25] IMA: avoid label collisions with stacked LSMs Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 05/25] LSM: Use lsmblob in security_audit_rule_match Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 06/25] LSM: Use lsmblob in security_kernel_act_as Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 07/25] LSM: Use lsmblob in security_secctx_to_secid Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 08/25] LSM: Use lsmblob in security_secid_to_secctx Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 09/25] LSM: Use lsmblob in security_ipc_getsecid Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 10/25] LSM: Use lsmblob in security_task_getsecid Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler [this message] 2021-07-22 0:47 ` [PATCH v28 11/25] LSM: Use lsmblob in security_inode_getsecid Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 12/25] LSM: Use lsmblob in security_cred_getsecid Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-23 23:56 ` kernel test robot 2021-07-23 23:56 ` kernel test robot 2021-07-23 23:56 ` kernel test robot 2021-07-22 0:47 ` [PATCH v28 13/25] IMA: Change internal interfaces to use lsmblobs Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 14/25] LSM: Specify which LSM to display Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 15/25] LSM: Ensure the correct LSM context releaser Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 16/25] LSM: Use lsmcontext in security_secid_to_secctx Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 17/25] LSM: Use lsmcontext in security_inode_getsecctx Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 18/25] LSM: security_secid_to_secctx in netlink netfilter Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 19/25] NET: Store LSM netlabel data in a lsmblob Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 20/25] LSM: Verify LSM display sanity in binder Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 21/25] audit: support non-syscall auxiliary records Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 17:02 ` kernel test robot 2021-07-22 17:02 ` kernel test robot 2021-07-22 17:02 ` kernel test robot 2021-07-22 0:47 ` [PATCH v28 22/25] Audit: Add record for multiple process LSM attributes Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 4:08 ` kernel test robot 2021-07-22 4:08 ` kernel test robot 2021-08-12 20:59 ` Paul Moore 2021-08-12 20:59 ` Paul Moore 2021-08-12 22:38 ` Casey Schaufler 2021-08-12 22:38 ` Casey Schaufler 2021-08-13 15:31 ` Paul Moore 2021-08-13 15:31 ` Paul Moore 2021-08-13 18:48 ` Casey Schaufler 2021-08-13 18:48 ` Casey Schaufler 2021-08-13 20:43 ` Paul Moore 2021-08-13 20:43 ` Paul Moore 2021-08-13 21:47 ` Casey Schaufler 2021-08-13 21:47 ` Casey Schaufler 2021-08-16 18:57 ` Paul Moore 2021-08-16 18:57 ` Paul Moore 2021-08-18 21:59 ` Casey Schaufler 2021-08-18 21:59 ` Casey Schaufler 2021-08-19 0:47 ` Paul Moore 2021-08-19 0:47 ` Paul Moore 2021-08-19 0:56 ` Casey Schaufler 2021-08-19 0:56 ` Casey Schaufler 2021-08-19 22:41 ` Casey Schaufler 2021-08-19 22:41 ` Casey Schaufler 2021-08-20 19:06 ` Paul Moore 2021-08-20 19:06 ` Paul Moore 2021-08-20 19:17 ` Casey Schaufler 2021-08-20 19:17 ` Casey Schaufler 2021-08-20 23:48 ` Casey Schaufler 2021-08-20 23:48 ` Casey Schaufler 2021-08-24 14:45 ` Paul Moore 2021-08-24 14:45 ` Paul Moore 2021-08-24 15:20 ` Casey Schaufler 2021-08-24 15:20 ` Casey Schaufler 2021-08-24 16:14 ` Paul Moore 2021-08-24 16:14 ` Paul Moore 2021-07-22 0:47 ` [PATCH v28 23/25] Audit: Add record for multiple object " Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 24/25] LSM: Add /proc attr entry for full LSM context Casey Schaufler 2021-07-22 0:47 ` Casey Schaufler 2021-07-22 0:47 ` [PATCH v28 25/25] AppArmor: Remove the exclusive flag Casey Schaufler 2021-07-22 0:47 ` 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=20210722004758.12371-12-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-audit@redhat.com \ --cc=linux-integrity@vger.kernel.org \ --cc=linux-kernel@vger.kernel.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: 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.