All of lore.kernel.org
 help / color / mirror / Atom feed
* [GIT] selinux: fix regression
@ 2012-07-11 16:11 James Morris
  2012-07-11 16:50 ` Andrew Morton
  0 siblings, 1 reply; 3+ messages in thread
From: James Morris @ 2012-07-11 16:11 UTC (permalink / raw)
  To: Linus Torvalds
  Cc: Andrew Morton, Eric Paris, Stephen Smalley,
	linux-security-module, linux-kernel

Please pull.

The following changes since commit 055c9fa8874fa7261eec7a268366565db84af474:
  Linus Torvalds (1):
        Merge tag 'fixes-for-v3.5' of git://git.kernel.org/.../linusw/linux-gpio

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git for-linus

Andrew Morton (1):
      selinux: fix regression in selinux_inode_setattr()

 security/selinux/hooks.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 17c284ce9688ece1fff024ef4a66f8f115017c06
Author: Andrew Morton <akpm@linux-foundation.org>
Date:   Tue Jul 10 23:24:24 2012 -0700

    selinux: fix regression in selinux_inode_setattr()
    
    akpm: This patch is needed to fix a box-killing post-3.4 X11 regression on
    my test machine.
    
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: James Morris <james.l.morris@oracle.com>

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 372ec65..4c62155 100644
--- a/security/selinux/hooks.c
+++ b/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 ((ia_valid & ATTR_SIZE) && selinux_policycap_openperm)
 		av |= FILE__OPEN;
 
 	return dentry_has_perm(cred, dentry, av);

^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-07-12  0:23 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-11 16:11 [GIT] selinux: fix regression James Morris
2012-07-11 16:50 ` Andrew Morton
2012-07-12  0:23   ` James Morris

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.