Skip to content

Commit ab55feb

Browse files
Christoph Hellwiggregkh
authored andcommitted
xfs: check for dead buffers in xfs_buf_find_insert
commit 07eae0f upstream. Commit 32dd4f9 ("xfs: remove a superflous hash lookup when inserting new buffers") converted xfs_buf_find_insert to use rhashtable_lookup_get_insert_fast and thus an operation that returns the existing buffer when an insert would duplicate the hash key. But this code path misses the check for a buffer with a reference count of zero, which could lead to reusing an about to be freed buffer. Fix this by using the same atomic_inc_not_zero pattern as xfs_buf_insert. Fixes: 32dd4f9 ("xfs: remove a superflous hash lookup when inserting new buffers") Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Dave Chinner <dchinner@redhat.com> Reviewed-by: Darrick J. Wong <djwong@kernel.org> Cc: stable@vger.kernel.org # v6.0 Signed-off-by: Carlos Maiolino <cem@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 57654a1 commit ab55feb

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

fs/xfs/xfs_buf.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -663,9 +663,8 @@ xfs_buf_find_insert(
663663
spin_unlock(&bch->bc_lock);
664664
goto out_free_buf;
665665
}
666-
if (bp) {
666+
if (bp && atomic_inc_not_zero(&bp->b_hold)) {
667667
/* found an existing buffer */
668-
atomic_inc(&bp->b_hold);
669668
spin_unlock(&bch->bc_lock);
670669
error = xfs_buf_find_lock(bp, flags);
671670
if (error)

0 commit comments

Comments
 (0)