public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Dave Chinner <david@fromorbit.com>
To: xfs@oss.sgi.com
Cc: bpm@sgi.com
Subject: [PATCH 2/2] xfs: kill suid/sgid through the truncate path.
Date: Fri, 24 May 2013 18:58:08 +1000	[thread overview]
Message-ID: <1369385888-17214-3-git-send-email-david@fromorbit.com> (raw)
In-Reply-To: <1369385888-17214-1-git-send-email-david@fromorbit.com>

From: Dave Chinner <dchinner@redhat.com>

XFS has failed to kill suid/sgid bits correctly when truncating
files of non-zero size since commit c4ed4243 ("xfs: split
xfs_setattr") introduced in the 3.1 kernel. Fix it.

Fix it.

cc: stable kernel <stable@vger.kernel.org>
Signed-off-by: Dave Chinner <dchinner@redhat.com>
---
 fs/xfs/xfs_iops.c |   43 ++++++++++++++++++++++++++++---------------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index d82efaa..c255382 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -455,6 +455,24 @@ xfs_vn_getattr(
 	return 0;
 }
 
+static void
+xfs_setattr_mode(
+	struct inode	*inode,
+	struct iattr	*iattr)
+{
+	struct xfs_inode *ip = XFS_I(inode);
+	umode_t		mode = iattr->ia_mode;
+
+	if (!in_group_p(inode->i_gid) && !capable(CAP_FSETID))
+		mode &= ~S_ISGID;
+
+	ip->i_d.di_mode &= S_IFMT;
+	ip->i_d.di_mode |= mode & ~S_IFMT;
+
+	inode->i_mode &= S_IFMT;
+	inode->i_mode |= mode & ~S_IFMT;
+}
+
 int
 xfs_setattr_nonsize(
 	struct xfs_inode	*ip,
@@ -606,18 +624,8 @@ xfs_setattr_nonsize(
 	/*
 	 * Change file access modes.
 	 */
-	if (mask & ATTR_MODE) {
-		umode_t mode = iattr->ia_mode;
-
-		if (!in_group_p(inode->i_gid) && !capable(CAP_FSETID))
-			mode &= ~S_ISGID;
-
-		ip->i_d.di_mode &= S_IFMT;
-		ip->i_d.di_mode |= mode & ~S_IFMT;
-
-		inode->i_mode &= S_IFMT;
-		inode->i_mode |= mode & ~S_IFMT;
-	}
+	if (mask & ATTR_MODE)
+		xfs_setattr_mode(inode, iattr);
 
 	/*
 	 * Change file access or modified times.
@@ -714,9 +722,8 @@ xfs_setattr_size(
 		return XFS_ERROR(error);
 
 	ASSERT(S_ISREG(ip->i_d.di_mode));
-	ASSERT((mask & (ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_ATIME|ATTR_ATIME_SET|
-			ATTR_MTIME_SET|ATTR_KILL_SUID|ATTR_KILL_SGID|
-			ATTR_KILL_PRIV|ATTR_TIMES_SET)) == 0);
+	ASSERT((mask & (ATTR_UID|ATTR_GID|ATTR_ATIME|ATTR_ATIME_SET|
+			ATTR_MTIME_SET|ATTR_KILL_PRIV|ATTR_TIMES_SET)) == 0);
 
 	if (!(flags & XFS_ATTR_NOLOCK)) {
 		lock_flags |= XFS_IOLOCK_EXCL;
@@ -860,6 +867,12 @@ xfs_setattr_size(
 		xfs_inode_clear_eofblocks_tag(ip);
 	}
 
+	/*
+	 * Change file access modes.
+	 */
+	if (mask & ATTR_MODE)
+		xfs_setattr_mode(inode, iattr);
+
 	if (mask & ATTR_CTIME) {
 		inode->i_ctime = iattr->ia_ctime;
 		ip->i_d.di_ctime.t_sec = iattr->ia_ctime.tv_sec;
-- 
1.7.10.4

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

  parent reply	other threads:[~2013-05-24  8:58 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-21  8:01 [PATCH 00/11] xfs: fixes for 3.10-rc3 Dave Chinner
2013-05-21  8:02 ` [PATCH 01/11] xfs: avoid nesting transactions in xfs_qm_scall_setqlim() Dave Chinner
2013-05-21 18:35   ` Ben Myers
2013-05-21  8:02 ` [PATCH 02/11] xfs: remote attribute allocation may be contiguous Dave Chinner
2013-05-21  8:02 ` [PATCH 03/11] xfs: remote attribute read too short Dave Chinner
2013-05-21 20:59   ` Ben Myers
2013-05-21 22:53     ` Dave Chinner
2013-05-21  8:02 ` [PATCH 04/11] xfs: remote attribute tail zeroing does too much Dave Chinner
2013-05-21 22:31   ` Ben Myers
2013-05-21 22:55     ` Dave Chinner
2013-05-21  8:02 ` [PATCH 05/11] xfs: correctly map remote attr buffers during removal Dave Chinner
2013-05-22 17:01   ` Ben Myers
2013-05-21  8:02 ` [PATCH 06/11] xfs: fully initialise temp leaf in xfs_attr3_leaf_unbalance Dave Chinner
2013-05-22 20:50   ` Ben Myers
2013-05-22 23:54     ` Dave Chinner
2013-05-23 22:51       ` Ben Myers
2013-05-21  8:02 ` [PATCH 07/11] xfs: fully initialise temp leaf in xfs_attr3_leaf_compact Dave Chinner
2013-05-22 21:59   ` Ben Myers
2013-05-22 23:58     ` Dave Chinner
2013-05-23 22:51       ` Ben Myers
2013-05-21  8:02 ` [PATCH 08/11] xfs: don't emit v5 superblock warnings on write Dave Chinner
2013-05-22 22:26   ` Ben Myers
2013-05-23  0:03     ` Dave Chinner
2013-05-23 15:23       ` Ben Myers
2013-05-23 23:13         ` Dave Chinner
2013-05-21  8:02 ` [PATCH 09/11] xfs: rework remote attr CRCs Dave Chinner
2013-05-23 21:54   ` Ben Myers
2013-05-23 23:35     ` Dave Chinner
2013-05-21  8:02 ` [PATCH 10/11] xfs: fix incorrect remote symlink block count Dave Chinner
2013-05-24 20:36   ` Ben Myers
2013-05-24 20:39     ` Ben Myers
2013-05-24 23:41       ` Dave Chinner
2013-05-25 15:16         ` Ben Myers
2013-05-21  8:02 ` [PATCH 11/11] xfs: increase number of ACL entries for V5 superblocks Dave Chinner
2013-05-21 14:00   ` Brian Foster
2013-05-21 20:27     ` Dave Chinner
2013-05-21 16:26 ` [PATCH 00/11] xfs: fixes for 3.10-rc3 Ben Myers
2013-05-21 20:24   ` Dave Chinner
2013-05-21 20:52     ` Ben Myers
2013-05-21 21:27       ` Dave Chinner
2013-05-23 12:30 ` [PATCH 0/2] xfs: more " Dave Chinner
2013-05-23 12:30   ` [PATCH 1/2] xfs: rework dquot CRCs Dave Chinner
2013-05-23 12:30   ` [PATCH 2/2] xfs: fix split buffer vector log recovery support Dave Chinner
2013-05-24  8:58   ` [patch 0/2] xfs: yet more fixes for 3.10-rc3 Dave Chinner
2013-05-24  8:58     ` [PATCH 1/2] xfs: disable swap extents ioctl on CRC enabled filesystems Dave Chinner
2013-05-24  8:58     ` Dave Chinner [this message]
2013-05-24 10:02       ` [PATCH 2/2] xfs: kill suid/sgid through the truncate path Christoph Hellwig
2013-05-24 10:07         ` Christoph Hellwig
2013-05-24 18:29 ` [PATCH 00/11] xfs: fixes for 3.10-rc3 Ben Myers

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=1369385888-17214-3-git-send-email-david@fromorbit.com \
    --to=david@fromorbit.com \
    --cc=bpm@sgi.com \
    --cc=xfs@oss.sgi.com \
    /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