Skip to content

Commit e8c5d45

Browse files
YeongjinGilMike Snitzer
authored andcommitted
dm verity: fix error handling for check_at_most_once on FEC
In verity_end_io(), if bi_status is not BLK_STS_OK, it can be return directly. But if FEC configured, it is desired to correct the data page through verity_verify_io. And the return value will be converted to blk_status and passed to verity_finish_io(). BTW, when a bit is set in v->validated_blocks, verity_verify_io() skips verification regardless of I/O error for the corresponding bio. In this case, the I/O error could not be returned properly, and as a result, there is a problem that abnormal data could be read for the corresponding block. To fix this problem, when an I/O error occurs, do not skip verification even if the bit related is set in v->validated_blocks. Fixes: 843f38d ("dm verity: add 'check_at_most_once' option to only validate hashes once") Cc: stable@vger.kernel.org Reviewed-by: Sungjong Seo <sj1557.seo@samsung.com> Signed-off-by: Yeongjin Gil <youngjin.gil@samsung.com> Signed-off-by: Mike Snitzer <snitzer@kernel.org>
1 parent 363b7fd commit e8c5d45

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/md/dm-verity-target.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ static int verity_verify_io(struct dm_verity_io *io)
523523
sector_t cur_block = io->block + b;
524524
struct ahash_request *req = verity_io_hash_req(v, io);
525525

526-
if (v->validated_blocks &&
526+
if (v->validated_blocks && bio->bi_status == BLK_STS_OK &&
527527
likely(test_bit(cur_block, v->validated_blocks))) {
528528
verity_bv_skip_block(v, io, iter);
529529
continue;

0 commit comments

Comments
 (0)