Commit 55237a5f authored Jan 25, 2018 by Liu Bo Committed by David Sterba Feb 02, 2018

Btrfs: fix extent state leak from tree log



It's possible that btrfs_sync_log() bails out after one of the two
btrfs_write_marked_extents() which convert extent state's state bit into
EXTENT_NEED_WAIT from EXTENT_DIRTY/EXTENT_NEW, however only EXTENT_DIRTY
and EXTENT_NEW are searched by free_log_tree() so that those extent states
with EXTENT_NEED_WAIT lead to memory leak.

cc: <stable@vger.kernel.org>
Signed-off-by: Liu Bo <bo.li.liu@oracle.com>
Reviewed-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent 1846430c

fs/btrfs/tree-log.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3026,13 +3026,14 @@ static void free_log_tree(struct btrfs_trans_handle *trans,

	while (1) {		while (1) {
	ret = find_first_extent_bit(&log->dirty_log_pages,		ret = find_first_extent_bit(&log->dirty_log_pages,
	0, &start, &end, EXTENT_DIRTY \| EXTENT_NEW,		0, &start, &end,
			EXTENT_DIRTY \| EXTENT_NEW \| EXTENT_NEED_WAIT,
	NULL);		NULL);
	if (ret)		if (ret)
	break;		break;

	clear_extent_bits(&log->dirty_log_pages, start, end,		clear_extent_bits(&log->dirty_log_pages, start, end,
	EXTENT_DIRTY \| EXTENT_NEW);		EXTENT_DIRTY \| EXTENT_NEW \| EXTENT_NEED_WAIT);
	}		}

	/*		/*