From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Eric Sandeen <sandeen@sandeen.net>
Cc: linux-xfs <linux-xfs@vger.kernel.org>
Subject: Re: [PATCH] xfs: fix leaks on corruption errors in xfs_bmap.c
Date: Mon, 27 Nov 2017 18:21:08 -0800 [thread overview]
Message-ID: <20171128022108.GF21412@magnolia> (raw)
In-Reply-To: <4b6bc004-3a7f-40f7-7d97-d1f358439b88@sandeen.net>
On Mon, Nov 27, 2017 at 04:48:02PM -0600, Eric Sandeen wrote:
> Use _GOTO instead of _RETURN so we can free the allocated
> cursor on error.
>
> Fixes: bf80628 ("xfs: remove xfs_bmse_shift_one")
> Fixes-coverity-id: 1423813
> Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Looks ok, will test
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
> ---
>
> Compile-tested only
>
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index 08df809..87884aa 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -5662,7 +5662,8 @@ static inline bool xfs_bmap_wants_extents(struct xfs_inode *ip, int whichfork)
> *done = true;
> goto del_cursor;
> }
> - XFS_WANT_CORRUPTED_RETURN(mp, !isnullstartblock(got.br_startblock));
> + XFS_WANT_CORRUPTED_GOTO(mp, !isnullstartblock(got.br_startblock),
> + del_cursor);
>
> new_startoff = got.br_startoff - offset_shift_fsb;
> if (xfs_iext_peek_prev_extent(ifp, &icur, &prev)) {
> @@ -5767,7 +5768,8 @@ static inline bool xfs_bmap_wants_extents(struct xfs_inode *ip, int whichfork)
> goto del_cursor;
> }
> }
> - XFS_WANT_CORRUPTED_RETURN(mp, !isnullstartblock(got.br_startblock));
> + XFS_WANT_CORRUPTED_GOTO(mp, !isnullstartblock(got.br_startblock),
> + del_cursor);
>
> if (stop_fsb >= got.br_startoff + got.br_blockcount) {
> error = -EIO;
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
prev parent reply other threads:[~2017-11-28 2:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-27 22:48 [PATCH] xfs: fix leaks on corruption errors in xfs_bmap.c Eric Sandeen
2017-11-27 22:49 ` Eric Sandeen
2017-11-28 2:21 ` Darrick J. Wong [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=20171128022108.GF21412@magnolia \
--to=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/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;
as well as URLs for NNTP newsgroup(s).