Skip to content

Commit 07f9d2c

Browse files
cschauflerpcmoore
authored andcommitted
lsm: use lsm_prop in security_inode_getsecid
Change the security_inode_getsecid() interface to fill in a lsm_prop 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_getlsmprop(). Cc: linux-integrity@vger.kernel.org Cc: selinux@vger.kernel.org Signed-off-by: Casey Schaufler <casey@schaufler-ca.com> [PM: subj line tweak] Signed-off-by: Paul Moore <paul@paul-moore.com>
1 parent 37f670a commit 07f9d2c

File tree

7 files changed

+33
-24
lines changed

7 files changed

+33
-24
lines changed

include/linux/lsm_hook_defs.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,8 @@ LSM_HOOK(int, -EOPNOTSUPP, inode_setsecurity, struct inode *inode,
176176
const char *name, const void *value, size_t size, int flags)
177177
LSM_HOOK(int, 0, inode_listsecurity, struct inode *inode, char *buffer,
178178
size_t buffer_size)
179-
LSM_HOOK(void, LSM_RET_VOID, inode_getsecid, struct inode *inode, u32 *secid)
179+
LSM_HOOK(void, LSM_RET_VOID, inode_getlsmprop, struct inode *inode,
180+
struct lsm_prop *prop)
180181
LSM_HOOK(int, 0, inode_copy_up, struct dentry *src, struct cred **new)
181182
LSM_HOOK(int, -EOPNOTSUPP, inode_copy_up_xattr, struct dentry *src,
182183
const char *name)

include/linux/security.h

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ int security_inode_getsecurity(struct mnt_idmap *idmap,
452452
void **buffer, bool alloc);
453453
int security_inode_setsecurity(struct inode *inode, const char *name, const void *value, size_t size, int flags);
454454
int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer_size);
455-
void security_inode_getsecid(struct inode *inode, u32 *secid);
455+
void security_inode_getlsmprop(struct inode *inode, struct lsm_prop *prop);
456456
int security_inode_copy_up(struct dentry *src, struct cred **new);
457457
int security_inode_copy_up_xattr(struct dentry *src, const char *name);
458458
int security_inode_setintegrity(const struct inode *inode,
@@ -1076,9 +1076,10 @@ static inline int security_inode_listsecurity(struct inode *inode, char *buffer,
10761076
return 0;
10771077
}
10781078

1079-
static inline void security_inode_getsecid(struct inode *inode, u32 *secid)
1079+
static inline void security_inode_getlsmprop(struct inode *inode,
1080+
struct lsm_prop *prop)
10801081
{
1081-
*secid = 0;
1082+
lsmprop_init(prop);
10821083
}
10831084

10841085
static inline int security_inode_copy_up(struct dentry *src, struct cred **new)

kernel/auditsc.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2276,13 +2276,17 @@ static void audit_copy_inode(struct audit_names *name,
22762276
const struct dentry *dentry,
22772277
struct inode *inode, unsigned int flags)
22782278
{
2279+
struct lsm_prop prop;
2280+
22792281
name->ino = inode->i_ino;
22802282
name->dev = inode->i_sb->s_dev;
22812283
name->mode = inode->i_mode;
22822284
name->uid = inode->i_uid;
22832285
name->gid = inode->i_gid;
22842286
name->rdev = inode->i_rdev;
2285-
security_inode_getsecid(inode, &name->osid);
2287+
security_inode_getlsmprop(inode, &prop);
2288+
/* scaffolding */
2289+
name->osid = prop.scaffold.secid;
22862290
if (flags & AUDIT_INODE_NOEVAL) {
22872291
name->fcap_ver = -1;
22882292
return;

security/integrity/ima/ima_policy.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -649,8 +649,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule,
649649
case LSM_OBJ_USER:
650650
case LSM_OBJ_ROLE:
651651
case LSM_OBJ_TYPE:
652-
/* scaffolding */
653-
security_inode_getsecid(inode, &prop.scaffold.secid);
652+
security_inode_getlsmprop(inode, &prop);
654653
rc = ima_filter_rule_match(&prop, lsm_rule->lsm[i].type,
655654
Audit_equal,
656655
lsm_rule->lsm[i].rule);

security/security.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2724,16 +2724,15 @@ int security_inode_listsecurity(struct inode *inode,
27242724
EXPORT_SYMBOL(security_inode_listsecurity);
27252725

27262726
/**
2727-
* security_inode_getsecid() - Get an inode's secid
2727+
* security_inode_getlsmprop() - Get an inode's LSM data
27282728
* @inode: inode
2729-
* @secid: secid to return
2729+
* @prop: lsm specific information to return
27302730
*
2731-
* Get the secid associated with the node. In case of failure, @secid will be
2732-
* set to zero.
2731+
* Get the lsm specific information associated with the node.
27332732
*/
2734-
void security_inode_getsecid(struct inode *inode, u32 *secid)
2733+
void security_inode_getlsmprop(struct inode *inode, struct lsm_prop *prop)
27352734
{
2736-
call_void_hook(inode_getsecid, inode, secid);
2735+
call_void_hook(inode_getlsmprop, inode, prop);
27372736
}
27382737

27392738
/**

security/selinux/hooks.c

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3503,15 +3503,18 @@ static int selinux_inode_listsecurity(struct inode *inode, char *buffer, size_t
35033503
return len;
35043504
}
35053505

3506-
static void selinux_inode_getsecid(struct inode *inode, u32 *secid)
3506+
static void selinux_inode_getlsmprop(struct inode *inode, struct lsm_prop *prop)
35073507
{
35083508
struct inode_security_struct *isec = inode_security_novalidate(inode);
3509-
*secid = isec->sid;
3509+
3510+
prop->selinux.secid = isec->sid;
3511+
/* scaffolding */
3512+
prop->scaffold.secid = isec->sid;
35103513
}
35113514

35123515
static int selinux_inode_copy_up(struct dentry *src, struct cred **new)
35133516
{
3514-
u32 sid;
3517+
struct lsm_prop prop;
35153518
struct task_security_struct *tsec;
35163519
struct cred *new_creds = *new;
35173520

@@ -3523,8 +3526,8 @@ static int selinux_inode_copy_up(struct dentry *src, struct cred **new)
35233526

35243527
tsec = selinux_cred(new_creds);
35253528
/* Get label from overlay inode and set it in create_sid */
3526-
selinux_inode_getsecid(d_inode(src), &sid);
3527-
tsec->create_sid = sid;
3529+
selinux_inode_getlsmprop(d_inode(src), &prop);
3530+
tsec->create_sid = prop.selinux.secid;
35283531
*new = new_creds;
35293532
return 0;
35303533
}
@@ -7174,7 +7177,7 @@ static struct security_hook_list selinux_hooks[] __ro_after_init = {
71747177
LSM_HOOK_INIT(inode_getsecurity, selinux_inode_getsecurity),
71757178
LSM_HOOK_INIT(inode_setsecurity, selinux_inode_setsecurity),
71767179
LSM_HOOK_INIT(inode_listsecurity, selinux_inode_listsecurity),
7177-
LSM_HOOK_INIT(inode_getsecid, selinux_inode_getsecid),
7180+
LSM_HOOK_INIT(inode_getlsmprop, selinux_inode_getlsmprop),
71787181
LSM_HOOK_INIT(inode_copy_up, selinux_inode_copy_up),
71797182
LSM_HOOK_INIT(inode_copy_up_xattr, selinux_inode_copy_up_xattr),
71807183
LSM_HOOK_INIT(path_notify, selinux_path_notify),

security/smack/smack_lsm.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,15 +1649,17 @@ static int smack_inode_listsecurity(struct inode *inode, char *buffer,
16491649
}
16501650

16511651
/**
1652-
* smack_inode_getsecid - Extract inode's security id
1652+
* smack_inode_getlsmprop - Extract inode's security id
16531653
* @inode: inode to extract the info from
1654-
* @secid: where result will be saved
1654+
* @prop: where result will be saved
16551655
*/
1656-
static void smack_inode_getsecid(struct inode *inode, u32 *secid)
1656+
static void smack_inode_getlsmprop(struct inode *inode, struct lsm_prop *prop)
16571657
{
16581658
struct smack_known *skp = smk_of_inode(inode);
16591659

1660-
*secid = skp->smk_secid;
1660+
prop->smack.skp = skp;
1661+
/* scaffolding */
1662+
prop->scaffold.secid = skp->smk_secid;
16611663
}
16621664

16631665
/*
@@ -5110,7 +5112,7 @@ static struct security_hook_list smack_hooks[] __ro_after_init = {
51105112
LSM_HOOK_INIT(inode_getsecurity, smack_inode_getsecurity),
51115113
LSM_HOOK_INIT(inode_setsecurity, smack_inode_setsecurity),
51125114
LSM_HOOK_INIT(inode_listsecurity, smack_inode_listsecurity),
5113-
LSM_HOOK_INIT(inode_getsecid, smack_inode_getsecid),
5115+
LSM_HOOK_INIT(inode_getlsmprop, smack_inode_getlsmprop),
51145116

51155117
LSM_HOOK_INIT(file_alloc_security, smack_file_alloc_security),
51165118
LSM_HOOK_INIT(file_ioctl, smack_file_ioctl),

0 commit comments

Comments
 (0)