Commit d701a8cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'xfs-5.17-merge-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux 

Pull xfs irix ioctl housecleaning from Darrick Wong:
 "Remove the XFS_IOC_ALLOCSP* and XFS_IOC_FREESP* ioctl families.

  This is the second of a series of small pull requests that perform
  some long overdue housecleaning of XFS ioctls. This time, we're
  vacating the implementation of all variants of the ALLOCSP and FREESP
  ioctls, which are holdovers from EFS in Irix, circa 1993. Roughly
  equivalent functionality have been available for both ioctls since
  2.6.25 (April 2008):

   - XFS_IOC_FREESP ftruncates a file.

   - XFS_IOC_ALLOCSP is the equivalent of fallocate.

  As noted in the fix patch for CVE 2021-4155, the ALLOCSP ioctl has
  been serving up stale disk blocks since 2000, and in 21 years
  **nobody** noticed. On those grounds I think it's safe to vacate the
  implementation.

  Note that we lose the ability to preallocate and truncate relative to
  the current file position, but as nobody's ever implemented that for
  the VFS, I conclude that it's not in high demand.

  Linux has always used fallocate as the space management system call,
  whereas these Irix legacy ioctls only ever worked on XFS, and have
  been the cause of recent stale data disclosure vulnerabilities. As
  equivalent functionality is available elsewhere, remove the code"

* tag 'xfs-5.17-merge-5' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: kill the XFS_IOC_{ALLOC,FREE}SP* ioctls
parents 12a8fb20 4d1b97f9

fs/xfs/xfs_bmap_util.c

+3 −4
Original line number Diff line number Diff line
@@ -771,8 +771,7 @@ int 
xfs_alloc_file_space(

	struct xfs_inode	*ip,

	xfs_off_t		offset,

	xfs_off_t		len,

	int			alloc_type)

	xfs_off_t		len)

{

	xfs_mount_t		*mp = ip->i_mount;

	xfs_off_t		count;
@@ -865,7 +864,7 @@ xfs_alloc_file_space( 
			goto error;



		error = xfs_bmapi_write(tp, ip, startoffset_fsb,

					allocatesize_fsb, alloc_type, 0, imapp,

				allocatesize_fsb, XFS_BMAPI_PREALLOC, 0, imapp,

				&nimaps);

		if (error)

			goto error;

fs/xfs/xfs_bmap_util.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ int xfs_bmap_last_extent(struct xfs_trans *tp, struct xfs_inode *ip, 


/* preallocation and hole punch interface */

int	xfs_alloc_file_space(struct xfs_inode *ip, xfs_off_t offset,

			     xfs_off_t len, int alloc_type);

			     xfs_off_t len);

int	xfs_free_file_space(struct xfs_inode *ip, xfs_off_t offset,

			    xfs_off_t len);

int	xfs_collapse_file_space(struct xfs_inode *, xfs_off_t offset,

fs/xfs/xfs_file.c

+1 −2
Original line number Diff line number Diff line
@@ -1051,8 +1051,7 @@ xfs_file_fallocate( 
		}



		if (!xfs_is_always_cow_inode(ip)) {

			error = xfs_alloc_file_space(ip, offset, len,

						     XFS_BMAPI_PREALLOC);

			error = xfs_alloc_file_space(ip, offset, len);

			if (error)

				goto out_unlock;

		}

fs/xfs/xfs_ioctl.c

+5 −88
Original line number Diff line number Diff line
@@ -627,87 +627,6 @@ xfs_attrmulti_by_handle( 
	return error;

}



int

xfs_ioc_space(

	struct file		*filp,

	xfs_flock64_t		*bf)

{

	struct inode		*inode = file_inode(filp);

	struct xfs_inode	*ip = XFS_I(inode);

	struct iattr		iattr;

	enum xfs_prealloc_flags	flags = XFS_PREALLOC_CLEAR;

	uint			iolock = XFS_IOLOCK_EXCL | XFS_MMAPLOCK_EXCL;

	int			error;



	if (inode->i_flags & (S_IMMUTABLE|S_APPEND))

		return -EPERM;



	if (!(filp->f_mode & FMODE_WRITE))

		return -EBADF;



	if (!S_ISREG(inode->i_mode))

		return -EINVAL;



	if (xfs_is_always_cow_inode(ip))

		return -EOPNOTSUPP;



	if (filp->f_flags & O_DSYNC)

		flags |= XFS_PREALLOC_SYNC;

	if (filp->f_mode & FMODE_NOCMTIME)

		flags |= XFS_PREALLOC_INVISIBLE;



	error = mnt_want_write_file(filp);

	if (error)

		return error;



	xfs_ilock(ip, iolock);

	error = xfs_break_layouts(inode, &iolock, BREAK_UNMAP);

	if (error)

		goto out_unlock;

	inode_dio_wait(inode);



	switch (bf->l_whence) {

	case 0: /*SEEK_SET*/

		break;

	case 1: /*SEEK_CUR*/

		bf->l_start += filp->f_pos;

		break;

	case 2: /*SEEK_END*/

		bf->l_start += XFS_ISIZE(ip);

		break;

	default:

		error = -EINVAL;

		goto out_unlock;

	}



	if (bf->l_start < 0 || bf->l_start > inode->i_sb->s_maxbytes) {

		error = -EINVAL;

		goto out_unlock;

	}



	if (bf->l_start > XFS_ISIZE(ip)) {

		error = xfs_alloc_file_space(ip, XFS_ISIZE(ip),

				bf->l_start - XFS_ISIZE(ip),

				XFS_BMAPI_PREALLOC);

		if (error)

			goto out_unlock;

	}



	iattr.ia_valid = ATTR_SIZE;

	iattr.ia_size = bf->l_start;

	error = xfs_vn_setattr_size(file_mnt_user_ns(filp), file_dentry(filp),

				    &iattr);

	if (error)

		goto out_unlock;



	error = xfs_update_prealloc_flags(ip, flags);



out_unlock:

	xfs_iunlock(ip, iolock);

	mnt_drop_write_file(filp);

	return error;

}



/* Return 0 on success or positive error */

int

xfs_fsbulkstat_one_fmt(
@@ -1965,13 +1884,11 @@ xfs_file_ioctl( 
	case XFS_IOC_ALLOCSP:

	case XFS_IOC_FREESP:

	case XFS_IOC_ALLOCSP64:

	case XFS_IOC_FREESP64: {

		xfs_flock64_t		bf;



		if (copy_from_user(&bf, arg, sizeof(bf)))

			return -EFAULT;

		return xfs_ioc_space(filp, &bf);

	}

	case XFS_IOC_FREESP64:

		xfs_warn_once(mp,

	"%s should use fallocate; XFS_IOC_{ALLOC,FREE}SP ioctl unsupported",

				current->comm);

		return -ENOTTY;

	case XFS_IOC_DIOINFO: {

		struct xfs_buftarg	*target = xfs_inode_buftarg(ip);

		struct dioattr		da;

fs/xfs/xfs_ioctl.h

+0 −6
Original line number Diff line number Diff line
@@ -10,12 +10,6 @@ struct xfs_bstat; 
struct xfs_ibulk;

struct xfs_inogrp;





extern int

xfs_ioc_space(

	struct file		*filp,

	xfs_flock64_t		*bf);



int

xfs_ioc_swapext(

	xfs_swapext_t	*sxp);