From: Andrew Morton <akpm@linux-foundation.org>
To: James Morris <jmorris@namei.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Eric Paris <eparis@redhat.com>,
Stephen Smalley <sds@tycho.nsa.gov>,
linux-security-module@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [GIT] selinux: fix regression
Date: Wed, 11 Jul 2012 09:50:30 -0700 [thread overview]
Message-ID: <20120711095030.f2db0ed9.akpm@linux-foundation.org> (raw)
In-Reply-To: <alpine.LRH.2.02.1207120211140.24051@tundra.namei.org>
On Thu, 12 Jul 2012 02:11:53 +1000 (EST) James Morris <jmorris@namei.org> wrote:
> 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);
The patch was authored by eparis, not me. I don't even know what it does (I
never looked). But it lets me log into my (old) Fedora test box, which
is a distinct improvement over mainline.
next prev parent reply other threads:[~2012-07-11 16:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-11 16:11 [GIT] selinux: fix regression James Morris
2012-07-11 16:50 ` Andrew Morton [this message]
2012-07-12 0:23 ` James Morris
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120711095030.f2db0ed9.akpm@linux-foundation.org \
--to=akpm@linux-foundation.org \
--cc=eparis@redhat.com \
--cc=jmorris@namei.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=sds@tycho.nsa.gov \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox