All of lore.kernel.org
 help / color / mirror / Atom feed
From: Dave Chinner <david@fromorbit.com>
To: Iustin Pop <iusty@k1024.org>
Cc: hch@infradead.org, xfs@oss.sgi.com
Subject: Re: [PATCH] xfs: fix behaviour of XFS_IOC_FSSETXATTR on directories
Date: Thu, 28 Aug 2014 19:31:58 +1000	[thread overview]
Message-ID: <20140828093158.GR20518@dastard> (raw)
In-Reply-To: <1409199773-16802-1-git-send-email-iusty@k1024.org>

On Wed, Aug 27, 2014 at 09:22:53PM -0700, Iustin Pop wrote:
> Currently, the ioctl handling code for XFS_IOC_FSSETXATTR treats all
> targets as regular files: it refuses to change the extent size if
> extents are allocated. This is wrong for directories, as there the
> extent size is only used as a default for children.
> 
> The patch fixes this by only checking for allocated extents for regular
> files; it leaves undefined what it means to set an extent size on a
> non-regular, non-directory inode. Additionally, when setting a non-zero
> extent size, the appropriate flags (EXTSIZE, respectively EXTSZINHERIT)
> are enforced for regular files and directories.
> 
> Signed-off-by: Iustin Pop <iusty@k1024.org>
> ---
>  A patch against xfstests to test for the fixed behaviour will follow
>  shortly.
> 
>  fs/xfs/xfs_ioctl.c | 34 ++++++++++++++++++++++++++--------
>  1 file changed, 26 insertions(+), 8 deletions(-)
> 
> diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
> index 8bc1bbc..5b9acd2 100644
> --- a/fs/xfs/xfs_ioctl.c
> +++ b/fs/xfs/xfs_ioctl.c
> @@ -1116,14 +1116,32 @@ xfs_ioctl_setattr(
>  	}
>  
>  	if (mask & FSX_EXTSIZE) {
> -		/*
> -		 * Can't change extent size if any extents are allocated.
> -		 */
> -		if (ip->i_d.di_nextents &&
> -		    ((ip->i_d.di_extsize << mp->m_sb.sb_blocklog) !=
> -		     fa->fsx_extsize)) {
> -			code = XFS_ERROR(EINVAL);	/* EFBIG? */
> -			goto error_return;

Doesn't apply to a current 3.17-rc1 tree. Can you update the patch?

> +		if (S_ISDIR(ip->i_d.di_mode)) {
> +			/*
> +			 * Enforce setting the EXTSZINHERIT flag when
> +			 * a non-zero extent size has been specified.
> +			 */
> +			if (fa->fsx_extsize) {
> +				fa->fsx_xflags |= XFS_XFLAG_EXTSZINHERIT;
> +			}
> +		} else if (S_ISREG(ip->i_d.di_mode)) {
> +			/*
> +			 * For a regular file, we can't change extent
> +			 * size if any extents are allocated.
> +			 */
> +			if (ip->i_d.di_nextents &&
> +			    ((ip->i_d.di_extsize << mp->m_sb.sb_blocklog) !=
> +			     fa->fsx_extsize)) {
> +				code = XFS_ERROR(EINVAL);	/* EFBIG? */
> +				goto error_return;
> +			}
> +			/*
> +			 * Enforce setting the EXTSIZE flag when
> +			 * a non-zero extent size has been specified.
> +			 */
> +			if (fa->fsx_extsize) {
> +				fa->fsx_xflags |= XFS_XFLAG_EXTSIZE;
> +			}
>  		}

Hmmmm. That's not validating/enforcing the correct use of
XFS_XFLAG_EXTSIZE or XFS_XFLAG_EXTSZINHERIT, that's setting it
implicitly based on the type of inode.

If we are going to enforce this properly, then XFS_XFLAG_EXTSIZE is
only valid for a regular file, and XFS_XFLAG_EXTSZINHERIT is only
valid on a directory, and the flags on th einode should only be set
if the hint is not zero. i.e:

	if (mask & FSX_EXTSIZE) {
		error = -EINVAL;

		/* validate the flags are set appropriately */
		if ((fa->fsx_xflags & XFS_XFLAG_EXTSIZE) &&
		    !S_ISREG(ip->i_d.di_mode))
			goto error_return;
		if ((fa->fsx_xflags & XFS_XFLAG_EXTSZINHERIT) &&
		    !S_ISDIR(ip->i_d.di_mode))
			goto error_return;

		/* Can't change extent size on regular files with allocated extents */
		if (S_ISREG(ip->i_d.di_mode) && ip->i_d.di_nextents &&
		    ((ip->i_d.di_extsize << mp->m_sb.sb_blocklog) !=
							fa->fsx_extsize))
			goto error_return;

		/* if the extent size is zero, clear the inode flags */
		if (fs->fsx_extsize == 0)
			fa->fsx_xflags &= ~(XFS_XFLAG_EXTSIZE | XFS_XFLAG_EXTSZINHERIT);
		} else {
			/* existing size check code */
			....
		}
	}

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com

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

  reply	other threads:[~2014-08-28  9:32 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-14  7:09 Error setting extent size on a directory Iustin Pop
2014-07-17  9:04 ` Christoph Hellwig
2014-07-18 19:13   ` Iustin Pop
2014-08-28  4:22     ` [PATCH] xfs: fix behaviour of XFS_IOC_FSSETXATTR on directories Iustin Pop
2014-08-28  9:31       ` Dave Chinner [this message]
2014-08-28 22:34         ` Iustin Pop
2014-08-29  0:46           ` Dave Chinner
2014-12-04  4:14             ` Iustin Pop
2014-12-05  0:11               ` Dave Chinner
2014-12-05  5:49                 ` Iustin Pop
2014-08-28  4:24     ` [PATCH xfstests] xfs: add tests for XFS_IOC_FSSETXATTR behaviour Iustin Pop
2014-08-28 10:16       ` Dave Chinner
2014-08-28 10:16         ` Dave Chinner
2014-08-28 22:28         ` Iustin Pop
2014-08-28 22:28           ` Iustin Pop
2014-08-29  2:52           ` Dave Chinner
2014-08-29  2:52             ` Dave Chinner
2014-12-04  4:20             ` [PATCH] xfs: add test " Iustin Pop
2014-12-04  4:20               ` Iustin Pop

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=20140828093158.GR20518@dastard \
    --to=david@fromorbit.com \
    --cc=hch@infradead.org \
    --cc=iusty@k1024.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.