Commit 67f03c3d authored Sep 01, 2020 by Ye Bin Committed by Greg Kroah-Hartman Sep 09, 2020

dm cache metadata: Avoid returning cmd->bm wild pointer on error



commit d16ff19e69ab57e08bf908faaacbceaf660249de upstream.

Maybe __create_persistent_data_objects() caller will use PTR_ERR as a
pointer, it will lead to some strange things.

Signed-off-by: Ye Bin <yebin10@huawei.com>
Cc: stable@vger.kernel.org
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 154096e9

drivers/md/dm-cache-metadata.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -537,12 +537,16 @@ static int __create_persistent_data_objects(struct dm_cache_metadata *cmd,
		CACHE_MAX_CONCURRENT_LOCKS);
		if (IS_ERR(cmd->bm)) {
		DMERR("could not create block manager");
		return PTR_ERR(cmd->bm);
		r = PTR_ERR(cmd->bm);
		cmd->bm = NULL;
		return r;
		}

		r = __open_or_format_metadata(cmd, may_format_device);
		if (r)
		if (r) {
		dm_block_manager_destroy(cmd->bm);
		cmd->bm = NULL;
		}

		return r;
		}