[PATCH v2 1/1] Return error on corrupted metadata in start_restoring_volume functions

[PATCH v2 1/1] Return error on corrupted metadata in start_restoring_volume functions

[Ivan Abramov]

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>
---
v2: Change approach as per Matthew Sakai's <msakai@redhat.com> suggestion.
Change subject and description accordingly. Also add Fixes tag.

 drivers/md/dm-vdo/indexer/volume-index.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/md/dm-vdo/indexer/volume-index.c b/drivers/md/dm-vdo/indexer/volume-index.c
index 12f954a0c532..afb062e1f1fb 100644
--- 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,
-- 
2.39.5

Re: [PATCH v2 1/1] Return error on corrupted metadata in start_restoring_volume functions

[Matthew Sakai]

On 9/9/25 4:22 PM, Ivan Abramov wrote:
> 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>

(cc'ing dm-devel this time)
Reviewed-by: Matthew Sakai <msakai@redhat.com>

> ---
> v2: Change approach as per Matthew Sakai's <msakai@redhat.com> suggestion.
> Change subject and description accordingly. Also add Fixes tag.
> 
>   drivers/md/dm-vdo/indexer/volume-index.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/md/dm-vdo/indexer/volume-index.c b/drivers/md/dm-vdo/indexer/volume-index.c
> index 12f954a0c532..afb062e1f1fb 100644
> --- 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,