From mboxrd@z Thu Jan 1 00:00:00 1970 From: Amerigo Wang Subject: [Patch 1/2] selinux: adjust rules for ATTR_FORCE Date: Wed, 19 Aug 2009 00:44:44 -0400 Message-ID: <20090819044709.5380.28436.sendpatchset@localhost.localdomain> References: <20090819044658.5380.43869.sendpatchset@localhost.localdomain> Cc: esandeen@redhat.com, eteo@redhat.com, eparis@redhat.com, Amerigo Wang , linux-fsdevel@vger.kernel.org, akpm@linux-foundation.org, sds@tycho.nsa.gov, hirofumi@mail.parknet.co.jp, viro@zeniv.linux.org.uk To: linux-kernel@vger.kernel.org Return-path: In-Reply-To: <20090819044658.5380.43869.sendpatchset@localhost.localdomain> Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org [PATCH] selinux: adjust rules for ATTR_FORCE From: Amerigo Wang As suggested by OGAWA Hirofumi in thread: http://lkml.org/lkml/2009/8/7/132, we should let selinux_inode_setattr() to match our ATTR_* rules. ATTR_FORCE should not force things like ATTR_SIZE. Cc: Eric Paris Signed-off-by: WANG Cong [tweaked-by: OGAWA Hirofumi ] Signed-off-by: OGAWA Hirofumi Acked-by: Stephen Smalley --- security/selinux/hooks.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff -puN security/selinux/hooks.c~selinux-truncate-fix security/selinux/hooks.c --- linux-2.6/security/selinux/hooks.c~selinux-truncate-fix 2009-08-18 06:27:58.000000000 +0900 +++ linux-2.6-hirofumi/security/selinux/hooks.c 2009-08-18 16:10:50.000000000 +0900 @@ -2711,12 +2711,18 @@ static int selinux_inode_permission(stru static int selinux_inode_setattr(struct dentry *dentry, struct iattr *iattr) { const struct cred *cred = current_cred(); + unsigned int ia_valid = iattr->ia_valid; - if (iattr->ia_valid & ATTR_FORCE) - return 0; + /* ATTR_FORCE is just used for ATTR_KILL_S[UG]ID. */ + if (ia_valid & ATTR_FORCE) { + ia_valid &= ~(ATTR_KILL_SUID | ATTR_KILL_SGID | ATTR_MODE | + ATTR_FORCE); + if (!ia_valid) + return 0; + } - if (iattr->ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID | - ATTR_ATIME_SET | ATTR_MTIME_SET)) + if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID | + ATTR_ATIME_SET | ATTR_MTIME_SET | ATTR_TIMES_SET)) return dentry_has_perm(cred, NULL, dentry, FILE__SETATTR); return dentry_has_perm(cred, NULL, dentry, FILE__WRITE); _