summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSunwook Eom <speed.eom@samsung.com>2020-04-10 12:54:19 +0900
committerGreg Kroah-Hartman <gregkh@google.com>2020-11-15 15:49:06 +0100
commitae6624540ecbafaae26a9e0b97e4bc2401dbe62c (patch)
treebdf2d8430b8732c81eece58511ef2e9857220726
parentd09244e6a1a3b7e3fe7b8f5af8cda232b5e81bc1 (diff)
UPSTREAM: dm verity fec: fix hash block number in verity_fec_decode
The error correction data is computed as if data and hash blocks were concatenated. But hash block number starts from v->hash_start. So, we have to calculate hash block number based on that. Fixes: a739ff3f543af ("dm verity: add support for forward error correction") Cc: stable@vger.kernel.org Signed-off-by: Sunwook Eom <speed.eom@samsung.com> Reviewed-by: Sami Tolvanen <samitolvanen@google.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com> (cherry picked from commit ad4e80a639fc61d5ecebb03caa5cdbfb91fcebfc) Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I2869d23628da0451a22cfec6348b89ce36ecbfbe Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
-rw-r--r--drivers/md/dm-verity-fec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-verity-fec.c b/drivers/md/dm-verity-fec.c
index 1dd667b97530..4844906c48bd 100644
--- a/drivers/md/dm-verity-fec.c
+++ b/drivers/md/dm-verity-fec.c
@@ -450,7 +450,7 @@ int verity_fec_decode(struct dm_verity *v, struct dm_verity_io *io,
fio->level++;
if (type == DM_VERITY_BLOCK_TYPE_METADATA)
- block += v->data_blocks;
+ block = block - v->hash_start + v->data_blocks;
/*
* For RS(M, N), the continuous FEC data is divided into blocks of N