aboutsummaryrefslogtreecommitdiffstats
path: root/fs/xfs
diff options
context:
space:
mode:
authorDwight Engen <dwight.engen@oracle.com>2013-08-15 14:08:03 -0400
committerBen Myers <bpm@sgi.com>2013-08-15 15:25:01 -0400
commit8c567a7fab6e086a0284eee2db82348521e7120c (patch)
treed76cf8cae0c26e5981a9cf5534b596394207eaf0 /fs/xfs
parentb9fe505258375b98519493a41a8088e384965aa9 (diff)
xfs: add capability check to free eofblocks ioctl
Check for CAP_SYS_ADMIN since the caller can truncate preallocated blocks from files they do not own nor have write access to. A more fine grained access check was considered: require the caller to specify their own uid/gid and to use inode_permission to check for write, but this would not catch the case of an inode not reachable via path traversal from the callers mount namespace. Add check for read-only filesystem to free eofblocks ioctl. Reviewed-by: Brian Foster <bfoster@redhat.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Gao feng <gaofeng@cn.fujitsu.com> Signed-off-by: Dwight Engen <dwight.engen@oracle.com> Signed-off-by: Ben Myers <bpm@sgi.com>
Diffstat (limited to 'fs/xfs')
-rw-r--r--fs/xfs/xfs_ioctl.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index 20b4c7af2928..bdebc21078d7 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -1723,6 +1723,12 @@ xfs_file_ioctl(
1723 struct xfs_fs_eofblocks eofb; 1723 struct xfs_fs_eofblocks eofb;
1724 struct xfs_eofblocks keofb; 1724 struct xfs_eofblocks keofb;
1725 1725
1726 if (!capable(CAP_SYS_ADMIN))
1727 return -EPERM;
1728
1729 if (mp->m_flags & XFS_MOUNT_RDONLY)
1730 return -XFS_ERROR(EROFS);
1731
1726 if (copy_from_user(&eofb, arg, sizeof(eofb))) 1732 if (copy_from_user(&eofb, arg, sizeof(eofb)))
1727 return -XFS_ERROR(EFAULT); 1733 return -XFS_ERROR(EFAULT);
1728 1734