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: a4eb7e255517 ("dm vdo: implement the volume index")
Signed-off-by: Ivan Abramov <i.abramov@mt-integration.ru>
Reviewed-by: Matthew Sakai <msakai@redhat.com>
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>

diff --git a/drivers/md/dm-vdo/indexer/volume-index.c b/drivers/md/dm-vdo/indexer/volume-index.c
index 12f954a0c5325d863c6986142d864152e05b0d21..afb062e1f1fb4845d8060f0ddc0b377266e850c2 100644 (file)
--- a/drivers/md/dm-vdo/indexer/volume-index.c
+++ b/drivers/md/dm-vdo/indexer/volume-index.c
@@ -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,