FAILED: patch "[PATCH] dm verity: fix error handling for check_at_most_once on FEC" failed to apply to 5.4-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x e8c5d45f82ce0c238a4817739892fe8897a3dcc3
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023050709-dry-stand-f81b@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
e8c5d45f82ce ("dm verity: fix error handling for check_at_most_once on FEC")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From e8c5d45f82ce0c238a4817739892fe8897a3dcc3 Mon Sep 17 00:00:00 2001
From: Yeongjin Gil <[email protected]>
Date: Mon, 20 Mar 2023 15:59:32 +0900
Subject: [PATCH] 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.
drivers/md/dm-verity-target.c +1 -1
@@ -523,7 +523,7 @@ static int verity_verify_io(struct dm_verity_io *io)sector_t cur_block = io->block + b;struct ahash_request *req =verity_io_hash_req (v, io); -if (v->validated_blocks && +if (v->validated_blocks && bio->bi_status ==BLK_STS_OK &&likely (test_bit (cur_block, v->validated_blocks))) {verity_bv_skip_block (v, io, iter);continue ;
PATCH 1/1 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.
--- drivers/md/dm-verity-target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-verity-target.c +1 -1
@@ -477,7 +477,7 @@ static int verity_verify_io(struct dm_verity_io *io)sector_t cur_block = io->block + b;struct ahash_request *req =verity_io_hash_req (v, io); -if (v->validated_blocks && +if (v->validated_blocks && bio->bi_status ==BLK_STS_OK &&likely (test_bit (cur_block, v->validated_blocks))) {verity_bv_skip_block (v, io, &io->iter);continue ;
Signature · 1 line
2.40.1
PATCH 1/1 dm verity: fix error handling for check_at_most_once on FEC
In reply to [email protected]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.
--- drivers/md/dm-verity-target.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/md/dm-verity-target.c +2 -1
@@ -471,13 +471,14 @@ 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;sector_t cur_block = io->block + b;struct ahash_request *req =verity_io_hash_req (v, io); -if (v->validated_blocks && +if (v->validated_blocks && bio->bi_status ==BLK_STS_OK &&likely (test_bit (cur_block, v->validated_blocks))) {verity_bv_skip_block (v, io, &io->iter);continue ;
Signature · 1 line
2.40.1
PATCH v2 1/1 dm verity: fix error handling for check_at_most_once on FEC
In reply to [email protected]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.
---
v2:
-Add bio definition in verity_verify_io
--- drivers/md/dm-verity-target.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/md/dm-verity-target.c +2 -1
@@ -471,13 +471,14 @@ 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;sector_t cur_block = io->block + b;struct ahash_request *req =verity_io_hash_req (v, io); -if (v->validated_blocks && +if (v->validated_blocks && bio->bi_status ==BLK_STS_OK &&likely (test_bit (cur_block, v->validated_blocks))) {verity_bv_skip_block (v, io, &io->iter);continue ;
Signature · 1 line
2.40.1