tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UBUNTU: SAUCE: apparmor4.0.0 [11/90]: LSM stacking v39: LSM: Use lsmblob in security_inode_getsecid

Browse Source 
BugLink: http://bugs.launchpad.net/bugs/2028253

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. Change the name to security_inode_getlsmblob().

Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: John Johansen <john.johansen@canonical.com>
Acked-by: Stephen Smalley <stephen.smalley.work@gmail.com>
Acked-by: Paul Moore <paul@paul-moore.com>
Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>
Cc: linux-integrity@vger.kernel.org
Cc: audit@vger.kernel.org
(cherry picked from commit 73e3677d926612a0861d4d16040df058a38e364a
https://git.launchpad.net/~apparmor-dev/ubuntu-kernel-next)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
This commit is contained in:
Casey Schaufler
2023-08-29 14:49:19 -07:00
committed by Paolo Pisati
parent 9f364a6999
commit 78d2691d3f
7 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/linux/lsm_hook_defs.h
+2 -1
View File
@@ -161,7 +161,8 @@ LSM_HOOK(int, -EOPNOTSUPP, inode_setsecurity, struct inode *inode,
const char *name, const void *value, size_t size, int flags)
LSM_HOOK(int, 0, inode_listsecurity, struct inode *inode, char *buffer,
size_t buffer_size)
LSM_HOOK(void, LSM_RET_VOID, inode_getsecid, struct inode *inode, u32 *secid)
LSM_HOOK(void, LSM_RET_VOID, inode_getlsmblob, struct inode *inode,
struct lsmblob *blob)
LSM_HOOK(int, 0, inode_copy_up, struct dentry *src, struct cred **new)
LSM_HOOK(int, -EOPNOTSUPP, inode_copy_up_xattr, const char *name)
LSM_HOOK(int, 0, kernfs_init_security, struct kernfs_node *kn_dir,
include/linux/security.h
+4 -3
View File
@@ -431,7 +431,7 @@ int security_inode_getsecurity(struct mnt_idmap *idmap,
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_getlsmblob(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,
@@ -1023,9 +1023,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_getlsmblob(struct inode *inode,
struct lsmblob *blob)
{
*secid = 0;
lsmblob_init(blob);
}
static inline int security_inode_copy_up(struct dentry *src, struct cred **new)
kernel/auditsc.c
+5 -1
View File
@@ -2276,13 +2276,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_getlsmblob(inode, &blob);
/* stacking scaffolding */
name->osid = blob.scaffold.secid;
if (flags & AUDIT_INODE_NOEVAL) {
name->fcap_ver = -1;
return;
security/integrity/ima/ima_policy.c
+1 -2
View File
@@ -671,8 +671,7 @@ retry:
case LSM_OBJ_USER:
case LSM_OBJ_ROLE:
case LSM_OBJ_TYPE:
/* stacking scaffolding */
security_inode_getsecid(inode, &blob.scaffold.secid);
security_inode_getlsmblob(inode, &blob);
rc = ima_filter_rule_match(&blob, lsm_rule->lsm[i].type,
Audit_equal,
lsm_rule->lsm[i].rule,
security/security.c
+5 -6
View File
@@ -2612,16 +2612,15 @@ int security_inode_listsecurity(struct inode *inode,
EXPORT_SYMBOL(security_inode_listsecurity);
/**
* security_inode_getsecid() - Get an inode's secid
* security_inode_getlsmblob() - Get an inode's LSM data
* @inode: inode
* @secid: secid to return
* @blob: lsm specific information to return
*
* Get the secid associated with the node. In case of failure, @secid will be
* set to zero.
* Get the lsm specific information associated with the node.
*/
void security_inode_getsecid(struct inode *inode, u32 *secid)
void security_inode_getlsmblob(struct inode *inode, struct lsmblob *blob)
{
call_void_hook(inode_getsecid, inode, secid);
call_void_hook(inode_getlsmblob, inode, blob);
}
/**
security/selinux/hooks.c
+9 -6
View File
@@ -3504,15 +3504,18 @@ static int selinux_inode_listsecurity(struct inode *inode, char *buffer, size_t
return len;
}
static void selinux_inode_getsecid(struct inode *inode, u32 *secid)
static void selinux_inode_getlsmblob(struct inode *inode, struct lsmblob *blob)
{
struct inode_security_struct *isec = inode_security_novalidate(inode);
*secid = isec->sid;
blob->selinux.secid = isec->sid;
/* stacking scaffolding */
blob->scaffold.secid = isec->sid;
}
static int selinux_inode_copy_up(struct dentry *src, struct cred **new)
{
u32 sid;
struct lsmblob blob;
struct task_security_struct *tsec;
struct cred *new_creds = *new;
@@ -3524,8 +3527,8 @@ static int selinux_inode_copy_up(struct dentry *src, struct cred **new)
tsec = selinux_cred(new_creds);
/* Get label from overlay inode and set it in create_sid */
selinux_inode_getsecid(d_inode(src), &sid);
tsec->create_sid = sid;
selinux_inode_getlsmblob(d_inode(src), &blob);
tsec->create_sid = blob.selinux.secid;
*new = new_creds;
return 0;
}
@@ -7181,7 +7184,7 @@ static struct security_hook_list selinux_hooks[] __ro_after_init = {
LSM_HOOK_INIT(inode_getsecurity, selinux_inode_getsecurity),
LSM_HOOK_INIT(inode_setsecurity, selinux_inode_setsecurity),
LSM_HOOK_INIT(inode_listsecurity, selinux_inode_listsecurity),
LSM_HOOK_INIT(inode_getsecid, selinux_inode_getsecid),
LSM_HOOK_INIT(inode_getlsmblob, selinux_inode_getlsmblob),
LSM_HOOK_INIT(inode_copy_up, selinux_inode_copy_up),
LSM_HOOK_INIT(inode_copy_up_xattr, selinux_inode_copy_up_xattr),
LSM_HOOK_INIT(path_notify, selinux_path_notify),
security/smack/smack_lsm.c
+7 -5
View File
@@ -1616,15 +1616,17 @@ static int smack_inode_listsecurity(struct inode *inode, char *buffer,
}
/**
* smack_inode_getsecid - Extract inode's security id
* smack_inode_getlsmblob - Extract inode's security id
* @inode: inode to extract the info from
* @secid: where result will be saved
* @blob: where result will be saved
*/
static void smack_inode_getsecid(struct inode *inode, u32 *secid)
static void smack_inode_getlsmblob(struct inode *inode, struct lsmblob *blob)
{
struct smack_known *skp = smk_of_inode(inode);
*secid = skp->smk_secid;
blob->smack.skp = skp;
/* stacking scaffolding */
blob->scaffold.secid = skp->smk_secid;
}
/*
@@ -5082,7 +5084,7 @@ static struct security_hook_list smack_hooks[] __ro_after_init = {
LSM_HOOK_INIT(inode_getsecurity, smack_inode_getsecurity),
LSM_HOOK_INIT(inode_setsecurity, smack_inode_setsecurity),
LSM_HOOK_INIT(inode_listsecurity, smack_inode_listsecurity),
LSM_HOOK_INIT(inode_getsecid, smack_inode_getsecid),
LSM_HOOK_INIT(inode_getlsmblob, smack_inode_getlsmblob),
LSM_HOOK_INIT(file_alloc_security, smack_file_alloc_security),
LSM_HOOK_INIT(file_ioctl, smack_file_ioctl),