From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay3.corp.sgi.com [198.149.34.15]) by oss.sgi.com (Postfix) with ESMTP id 5239D7F78 for ; Tue, 23 Jul 2013 23:52:51 -0500 (CDT) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay3.corp.sgi.com (Postfix) with ESMTP id C246AAC006 for ; Tue, 23 Jul 2013 21:52:50 -0700 (PDT) Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) by cuda.sgi.com with ESMTP id rEFXA5m0dqW6pAnG (version=TLSv1 cipher=AES256-SHA bits=256 verify=NO) for ; Tue, 23 Jul 2013 21:52:49 -0700 (PDT) Received: from acsinet21.oracle.com (acsinet21.oracle.com [141.146.126.237]) by aserp1040.oracle.com (Sentrion-MTA-4.3.1/Sentrion-MTA-4.3.1) with ESMTP id r6O4qmVb007258 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 24 Jul 2013 04:52:49 GMT Received: from userz7022.oracle.com (userz7022.oracle.com [156.151.31.86]) by acsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r6O4qlYV013280 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 24 Jul 2013 04:52:48 GMT Received: from abhmt115.oracle.com (abhmt115.oracle.com [141.146.116.67]) by userz7022.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r6O4qlBM027276 for ; Wed, 24 Jul 2013 04:52:47 GMT Date: Wed, 24 Jul 2013 00:53:01 -0400 From: Dwight Engen Subject: [PATCH v5 6/7] xfs: add permission check to free eofblocks ioctl Message-ID: <20130724005301.0ed718d2@oracle.com> Mime-Version: 1.0 List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: xfs@oss.sgi.com We need to check that userspace callers can only truncate preallocated blocks from files they have write access to to prevent them from prematurley reclaiming blocks from another user. The internal reclaimer will not specify the XFS_EOF_FLAGS_PERM_CHECK flag, but userspace callers should. Add check for read-only filesystem to free eofblocks ioctl. Signed-off-by: Dwight Engen --- fs/xfs/xfs_fs.h | 1 + fs/xfs/xfs_icache.c | 4 ++++ fs/xfs/xfs_ioctl.c | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/fs/xfs/xfs_fs.h b/fs/xfs/xfs_fs.h index 7eb4a5e..aee4b12 100644 --- a/fs/xfs/xfs_fs.h +++ b/fs/xfs/xfs_fs.h @@ -361,6 +361,7 @@ struct xfs_fs_eofblocks { #define XFS_EOF_FLAGS_GID (1 << 2) /* filter by gid */ #define XFS_EOF_FLAGS_PRID (1 << 3) /* filter by project id */ #define XFS_EOF_FLAGS_MINFILESIZE (1 << 4) /* filter by min file size */ +#define XFS_EOF_FLAGS_PERM_CHECK (1 << 5) /* check can write inode */ #define XFS_EOF_FLAGS_VALID \ (XFS_EOF_FLAGS_SYNC | \ XFS_EOF_FLAGS_UID | \ diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c index ed35584..823f2c0 100644 --- a/fs/xfs/xfs_icache.c +++ b/fs/xfs/xfs_icache.c @@ -1247,6 +1247,10 @@ xfs_inode_free_eofblocks( if (!xfs_inode_match_id(ip, eofb)) return 0; + if ((eofb->eof_flags & XFS_EOF_FLAGS_PERM_CHECK) && + inode_permission(VFS_I(ip), MAY_WRITE)) + return 0; + /* skip the inode if the file size is too small */ if (eofb->eof_flags & XFS_EOF_FLAGS_MINFILESIZE && XFS_ISIZE(ip) < eofb->eof_min_file_size) diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index ecab261..c7cb632 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -1613,6 +1613,9 @@ xfs_file_ioctl( struct xfs_fs_eofblocks eofb; struct xfs_eofblocks keofb; + if (IS_RDONLY(inode)) + return -XFS_ERROR(EROFS); + if (copy_from_user(&eofb, arg, sizeof(eofb))) return -XFS_ERROR(EFAULT); @@ -1630,6 +1633,7 @@ xfs_file_ioctl( if (error) return -error; + keofb.eof_flags |= XFS_EOF_FLAGS_PERM_CHECK; return -xfs_icache_free_eofblocks(mp, &keofb); } -- 1.8.1.4 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs