From 4b6bb28b5cf77a155d11c56d24fcba1b5f9c4b2a Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Fri, 6 Jul 2012 14:13:30 -0400 Subject: [PATCH] --- yaml --- r: 312072 b: refs/heads/master c: 3d2195c3324b27e65ba53d9626a6bd91a2515797 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/security/selinux/hooks.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7869492d2356..c34d9506077c 100644 --- 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 index 372ec6502aa8..ffd8900a38e8 100644 --- 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);