From: Brian Foster <bfoster@redhat.com>
To: Peter Watkins <treestem@gmail.com>
Cc: xfs@oss.sgi.com
Subject: Re: [PATCH v2] xfs: overflow in xfs_iomap_eof_align_last_fsb
Date: Tue, 2 Dec 2014 11:24:40 -0500 [thread overview]
Message-ID: <20141202162438.GA2113@laptop.bfoster> (raw)
In-Reply-To: <1417473928-447-1-git-send-email-treestem@gmail.com>
On Mon, Dec 01, 2014 at 05:45:28PM -0500, Peter Watkins wrote:
> 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 stripe size up to extsize.
>
> Signed-off-by: Peter Watkins <treestem@gmail.com>
> Reviewed-by: Nathaniel W. Turner <nate@houseofnate.net>
> ---
Looks fine to me:
Reviewed-by: Brian Foster <bfoster@redhat.com>
> fs/xfs/xfs_iomap.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
> index afcf3c9..3fad071 100644
> --- a/fs/xfs/xfs_iomap.c
> +++ b/fs/xfs/xfs_iomap.c
> @@ -52,7 +52,6 @@ xfs_iomap_eof_align_last_fsb(
> xfs_extlen_t extsize,
> xfs_fileoff_t *last_fsb)
> {
> - xfs_fileoff_t new_last_fsb = 0;
> xfs_extlen_t align = 0;
> int eof, error;
>
> @@ -70,8 +69,8 @@ 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;
> }
>
> /*
> @@ -79,14 +78,14 @@ xfs_iomap_eof_align_last_fsb(
> * (when file on a real-time subvolume or has di_extsize hint).
> */
> if (extsize) {
> - if (new_last_fsb)
> - align = roundup_64(new_last_fsb, extsize);
> + if (align)
> + align = roundup_64(align, extsize);
> else
> align = extsize;
> - new_last_fsb = roundup_64(*last_fsb, align);
> }
>
> - if (new_last_fsb) {
> + if (align) {
> + xfs_fileoff_t 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
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
prev parent reply other threads:[~2014-12-02 16:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-24 19:06 [PATCH] xfs: overflow in xfs_iomap_eof_align_last_fsb Peter Watkins
2014-11-25 13:49 ` Brian Foster
2014-11-25 23:18 ` Dave Chinner
2014-12-01 22:45 ` [PATCH v2] " Peter Watkins
2014-12-02 16:24 ` Brian Foster [this message]
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=20141202162438.GA2113@laptop.bfoster \
--to=bfoster@redhat.com \
--cc=treestem@gmail.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox