From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Brian Foster <bfoster@redhat.com>
Cc: linux-xfs@vger.kernel.org
Subject: Re: [PATCH] xfs: fix use after free in buf log item unlock assert
Date: Wed, 6 Feb 2019 08:10:52 -0800 [thread overview]
Message-ID: <20190206161052.GM7991@magnolia> (raw)
In-Reply-To: <20190206160107.63672-1-bfoster@redhat.com>
On Wed, Feb 06, 2019 at 11:01:07AM -0500, Brian Foster wrote:
> The xfs_buf_log_item ->iop_unlock() callback asserts that the buffer
> is unlocked when either non-stale or aborted. This assert occurs
> after the bli refcount has been dropped and the log item potentially
> freed. The aborted check is thus a potential use after free. This
> problem has been reproduced with KASAN enabled via generic/475.
>
> Fix up xfs_buf_item_unlock() to query aborted state before the bli
> reference is dropped to prevent a potential use after free.
>
> Signed-off-by: Brian Foster <bfoster@redhat.com>
Seems reasonable,
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
--D
> ---
> fs/xfs/xfs_buf_item.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c
> index 010db5f8fb00..65b32acfa0f6 100644
> --- a/fs/xfs/xfs_buf_item.c
> +++ b/fs/xfs/xfs_buf_item.c
> @@ -605,6 +605,8 @@ xfs_buf_item_unlock(
> #if defined(DEBUG) || defined(XFS_WARN)
> bool ordered = bip->bli_flags & XFS_BLI_ORDERED;
> bool dirty = bip->bli_flags & XFS_BLI_DIRTY;
> + bool aborted = test_bit(XFS_LI_ABORTED,
> + &lip->li_flags);
> #endif
>
> trace_xfs_buf_item_unlock(bip);
> @@ -633,7 +635,7 @@ xfs_buf_item_unlock(
> released = xfs_buf_item_put(bip);
> if (hold || (stale && !released))
> return;
> - ASSERT(!stale || test_bit(XFS_LI_ABORTED, &lip->li_flags));
> + ASSERT(!stale || aborted);
> xfs_buf_relse(bp);
> }
>
> --
> 2.17.2
>
next prev parent reply other threads:[~2019-02-06 16:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-06 16:01 [PATCH] xfs: fix use after free in buf log item unlock assert Brian Foster
2019-02-06 16:10 ` Darrick J. Wong [this message]
2019-03-29 14:03 ` Brian Foster
2019-03-29 14:13 ` Darrick J. Wong
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=20190206161052.GM7991@magnolia \
--to=darrick.wong@oracle.com \
--cc=bfoster@redhat.com \
--cc=linux-xfs@vger.kernel.org \
/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).