diff options
Diffstat (limited to 'security/selinux/hooks.c')
| -rw-r--r-- | security/selinux/hooks.c | 5 | 
1 files changed, 2 insertions, 3 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 372ec6502aa..9292a8971e6 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c @@ -2157,8 +2157,7 @@ static inline void flush_unauthorized_files(const struct cred *cred,  						get_file(devnull);  					} else {  						devnull = dentry_open( -							dget(selinux_null), -							mntget(selinuxfs_mount), +							&selinux_null,  							O_RDWR, cred);  						if (IS_ERR(devnull)) {  							devnull = NULL; @@ -2717,7 +2716,7 @@ static int selinux_inode_setattr(struct dentry *dentry, struct iattr *iattr)  			ATTR_ATIME_SET | ATTR_MTIME_SET | ATTR_TIMES_SET))  		return dentry_has_perm(cred, dentry, FILE__SETATTR); -	if (ia_valid & ATTR_SIZE) +	if (selinux_policycap_openperm && (ia_valid & ATTR_SIZE))  		av |= FILE__OPEN;  	return dentry_has_perm(cred, dentry, av);  |