dm_verity_fec_io is placed after the end of two hash digests. If the hash
digest has unaligned length, struct dm_verity_fec_io could be unaligned.
This commit fixes the placement of struct dm_verity_fec_io, so that it's
aligned.
Signed-off-by: Mikulas Patocka <mpatocka@xxxxxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx
Fixes: a739ff3f543a ("dm verity: add support for forward error correction")
---
drivers/md/dm-verity-fec.c | 3 ++-
drivers/md/dm-verity.h | 6 ------
2 files changed, 2 insertions(+), 7 deletions(-)
Index: linux-2.6/drivers/md/dm-verity-fec.c
===================================================================
--- linux-2.6.orig/drivers/md/dm-verity-fec.c 2023-11-21 15:20:13.000000000 +0100
+++ linux-2.6/drivers/md/dm-verity-fec.c 2023-11-21 15:21:30.000000000 +0100
@@ -24,7 +24,8 @@ bool verity_fec_is_enabled(struct dm_ver
*/
static inline struct dm_verity_fec_io *fec_io(struct dm_verity_io *io)
{
- return (struct dm_verity_fec_io *) verity_io_digest_end(io->v, io);
+ return (struct dm_verity_fec_io *)
+ ((char *)io + io->v->ti->per_io_data_size - sizeof(struct dm_verity_fec_io));
}
/*
Index: linux-2.6/drivers/md/dm-verity.h
===================================================================
--- linux-2.6.orig/drivers/md/dm-verity.h 2023-11-21 14:32:23.000000000 +0100
+++ linux-2.6/drivers/md/dm-verity.h 2023-11-28 14:49:04.000000000 +0100
@@ -115,12 +115,6 @@ static inline u8 *verity_io_want_digest(
return (u8 *)(io + 1) + v->ahash_reqsize + v->digest_size;
}
-static inline u8 *verity_io_digest_end(struct dm_verity *v,
- struct dm_verity_io *io)
-{
- return verity_io_want_digest(v, io) + v->digest_size;
-}
-
extern int verity_for_bv_block(struct dm_verity *v, struct dm_verity_io *io,
struct bvec_iter *iter,
int (*process)(struct dm_verity *v,
