Re: [PATCH] xfs: overflow in xfs_iomap_eof_align_last_fsb

Brian Foster
2014-11-25T13:50:10Z

On Mon, Nov 24, 2014 at 02:06:13PM -0500, Peter Watkins wrote:
> Someone else may have run into this already, if not please take
> a look.
>
> Peter
>
> If extsize is set and new_last_fsb is larger than 32 bits, the
> roundup to extsize will overflow the align variable. Instead,
> combine alignments by rounding extsize hint up to stripe size.
>
> Signed-off-by: Peter Watkins <treestem@gmail.com>
> Reviewed-by: Nathaniel W. Turner <nate@houseofnate.net>
> ---

So we basically assign a file offset value to an extent length variable.
Nice spot...

> fs/xfs/xfs_iomap.c | 19 ++++++++++---------
> 1 file changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
> index afcf3c9..0c4abfe 100644
> --- a/fs/xfs/xfs_iomap.c
> +++ b/fs/xfs/xfs_iomap.c
> @@ -52,7 +52,7 @@ xfs_iomap_eof_align_last_fsb(
> xfs_extlen_t extsize,
> xfs_fileoff_t *last_fsb)
> {
> - xfs_fileoff_t new_last_fsb = 0;
> + xfs_fileoff_t new_last_fsb;
> xfs_extlen_t align = 0;
> int eof, error;
>
> @@ -70,23 +70,24 @@ xfs_iomap_eof_align_last_fsb(
> else if (mp->m_dalign)
> align = mp->m_dalign;
>
> - if (align && XFS_ISIZE(ip) >= XFS_FSB_TO_B(mp, align))
> - new_last_fsb = roundup_64(*last_fsb, align);
> + if (align && XFS_ISIZE(ip) < XFS_FSB_TO_B(mp, align))
> + align = 0;
> }
>
> /*
> - * Always round up the allocation request to an extent boundary
> - * (when file on a real-time subvolume or has di_extsize hint).
> + * Round up the allocation request to an extent boundary. If
> + * already aligned to a stripe, round extsize up to a stripe
> + * boundary.
> */
> if (extsize) {
> - if (new_last_fsb)
> - align = roundup_64(new_last_fsb, extsize);
> + if (align)
> + align = roundup_64(extsize, align);

I think the previous behavior would swap this around and round up the
alignment to the extsize. Because we aligned from the actual fsb, we'd
effectively use the stripe alignment as a min. alloc and always align to
the hint. Here we simply round up extsize to the stripe alignment. IOW,
the alignment was previously always to the hint, even if smaller than
the stripe alignment, and now we align to the larger of the hint or
stripe.

That said, it's kind of a weird scenario and it's not clear to me
whether it's important or even intended. If not, the patch seems Ok to
me...

Brian

> else
> align = extsize;
> - new_last_fsb = roundup_64(*last_fsb, align);
> }
>
> - if (new_last_fsb) {
> + if (align) {
> + new_last_fsb = roundup_64(*last_fsb, align);
> error = xfs_bmap_eof(ip, new_last_fsb, XFS_DATA_FORK, &eof);
> if (error)
> return error;
> --
> 1.7.9.5
>
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs