Commit 9ddf6d3f authored by Ivan Abramov's avatar Ivan Abramov Committed by Mikulas Patocka
Browse files

dm vdo: return error on corrupted metadata in start_restoring_volume functions 



The return values of VDO_ASSERT calls that validate metadata are not acted
upon.

Return UDS_CORRUPT_DATA in case of an error.

Found by Linux Verification Center (linuxtesting.org) with SVACE.

Fixes: a4eb7e25 ("dm vdo: implement the volume index")
Signed-off-by: default avatarIvan Abramov <i.abramov@mt-integration.ru>
Reviewed-by: default avatarMatthew Sakai <msakai@redhat.com>
Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
parent e828a187

drivers/md/dm-vdo/indexer/volume-index.c

+2 −2
Original line number Diff line number Diff line
@@ -836,7 +836,7 @@ static int start_restoring_volume_sub_index(struct volume_sub_index *sub_index, 
				    "%zu bytes decoded of %zu expected", offset,

				    sizeof(buffer));

		if (result != VDO_SUCCESS)

			result = UDS_CORRUPT_DATA;

			return UDS_CORRUPT_DATA;



		if (memcmp(header.magic, MAGIC_START_5, MAGIC_SIZE) != 0) {

			return vdo_log_warning_strerror(UDS_CORRUPT_DATA,
@@ -928,7 +928,7 @@ static int start_restoring_volume_index(struct volume_index *volume_index, 
				    "%zu bytes decoded of %zu expected", offset,

				    sizeof(buffer));

		if (result != VDO_SUCCESS)

			result = UDS_CORRUPT_DATA;

			return UDS_CORRUPT_DATA;



		if (memcmp(header.magic, MAGIC_START_6, MAGIC_SIZE) != 0)

			return vdo_log_warning_strerror(UDS_CORRUPT_DATA,