Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c9e80ed authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

SECURITY: Move exec_permission RCU checks into security modules 



Right now all RCU walks fall back to reference walk when CONFIG_SECURITY
is enabled, even though just the standard capability module is active.
This is because security_inode_exec_permission unconditionally fails
RCU walks.

Move this decision to the low level security module. This requires
passing the RCU flags down the security hook. This way at least
the capability module and a few easy cases in selinux/smack work
with RCU walks with CONFIG_SECURITY=y

Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarEric Paris <eparis@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8d082f8f

include/linux/security.h

+1 −1
Original line number Diff line number Diff line
@@ -1456,7 +1456,7 @@ struct security_operations { 
			     struct inode *new_dir, struct dentry *new_dentry);

	int (*inode_readlink) (struct dentry *dentry);

	int (*inode_follow_link) (struct dentry *dentry, struct nameidata *nd);

	int (*inode_permission) (struct inode *inode, int mask);

	int (*inode_permission) (struct inode *inode, int mask, unsigned flags);

	int (*inode_setattr)	(struct dentry *dentry, struct iattr *attr);

	int (*inode_getattr) (struct vfsmount *mnt, struct dentry *dentry);

	int (*inode_setxattr) (struct dentry *dentry, const char *name,

security/capability.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static int cap_inode_follow_link(struct dentry *dentry, 
	return 0;

}



static int cap_inode_permission(struct inode *inode, int mask)

static int cap_inode_permission(struct inode *inode, int mask, unsigned flags)

{

	return 0;

}

security/security.c

+2 −4
Original line number Diff line number Diff line
@@ -518,16 +518,14 @@ int security_inode_permission(struct inode *inode, int mask) 
{

	if (unlikely(IS_PRIVATE(inode)))

		return 0;

	return security_ops->inode_permission(inode, mask);

	return security_ops->inode_permission(inode, mask, 0);

}



int security_inode_exec_permission(struct inode *inode, unsigned int flags)

{

	if (unlikely(IS_PRIVATE(inode)))

		return 0;

	if (flags)

		return -ECHILD;

	return security_ops->inode_permission(inode, MAY_EXEC);

	return security_ops->inode_permission(inode, MAY_EXEC, flags);

}



int security_inode_setattr(struct dentry *dentry, struct iattr *attr)

security/selinux/hooks.c

+5 −1
Original line number Diff line number Diff line
@@ -2635,7 +2635,7 @@ static int selinux_inode_follow_link(struct dentry *dentry, struct nameidata *na 
	return dentry_has_perm(cred, NULL, dentry, FILE__READ);

}



static int selinux_inode_permission(struct inode *inode, int mask)

static int selinux_inode_permission(struct inode *inode, int mask, unsigned flags)

{

	const struct cred *cred = current_cred();

	struct common_audit_data ad;
@@ -2649,6 +2649,10 @@ static int selinux_inode_permission(struct inode *inode, int mask) 
	if (!mask)

		return 0;



	/* May be droppable after audit */

	if (flags & IPERM_FLAG_RCU)

		return -ECHILD;



	COMMON_AUDIT_DATA_INIT(&ad, FS);

	ad.u.fs.inode = inode;

security/smack/smack_lsm.c

+5 −1
Original line number Diff line number Diff line
@@ -686,7 +686,7 @@ static int smack_inode_rename(struct inode *old_inode, 
 *

 * Returns 0 if access is permitted, -EACCES otherwise

 */

static int smack_inode_permission(struct inode *inode, int mask)

static int smack_inode_permission(struct inode *inode, int mask, unsigned flags)

{

	struct smk_audit_info ad;
@@ -696,6 +696,10 @@ static int smack_inode_permission(struct inode *inode, int mask) 
	 */

	if (mask == 0)

		return 0;



	/* May be droppable after audit */

	if (flags & IPERM_FLAG_RCU)

		return -ECHILD;

	smk_ad_init(&ad, __func__, LSM_AUDIT_DATA_FS);

	smk_ad_setfield_u_fs_inode(&ad, inode);

	return smk_curacc(smk_of_inode(inode), mask, &ad);