---

yaml --- r: 312072 b: refs/heads/master c: 3d2195c h: refs/heads/master v: v3
git-mirror · Jul 16, 2012 · 4b6bb28 · 4b6bb28
1 parent 9af2fb7
commit 4b6bb28
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64919e60915c5151b3dd4c8d2d9237a115ca990c
+refs/heads/master: 3d2195c3324b27e65ba53d9626a6bd91a2515797
diff --git a/trunk/security/selinux/hooks.c b/trunk/security/selinux/hooks.c
@@ -2717,7 +2717,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);