Merge "FROMLIST: dm-verity: skip verity_handle_error on I/O errors" (54ae581c) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/md/dm-verity-target.c

+11 −2

Original line number	Diff line number	Diff line
		@@ -483,6 +483,7 @@ static int verity_verify_io(struct dm_verity_io *io)
		struct bvec_iter start;
		unsigned b;
		struct crypto_wait wait;
		struct bio *bio = dm_bio_from_per_bio_data(io, v->ti->per_io_data_size);

		for (b = 0; b < io->n_blocks; b++) {
		int r;
		@@ -537,10 +538,18 @@ static int verity_verify_io(struct dm_verity_io *io)
		else if (verity_fec_decode(v, io, DM_VERITY_BLOCK_TYPE_DATA,
		cur_block, NULL, &start) == 0)
		continue;
		else if (verity_handle_err(v, DM_VERITY_BLOCK_TYPE_DATA,
		else {
		if (bio->bi_status) {
		/*
		* Error correction failed; Just return error
		*/
		return -EIO;
		}
		if (verity_handle_err(v, DM_VERITY_BLOCK_TYPE_DATA,
		cur_block))
		return -EIO;
		}
		}

		return 0;
		}