diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2023-11-28 14:50:23 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-12-08 08:42:00 +0100 |
| commit | b5813891dad9bd5ebbc4790e20d82fd19466dd18 (patch) | |
| tree | 948f7ba62c5f3463b44b3792009662351cba00ba | |
| parent | a14403bf84c148b2b66c83af01cad70ee7fae8c3 (diff) | |
| download | linux-stable-b5813891dad9bd5ebbc4790e20d82fd19466dd18.tar.gz linux-stable-b5813891dad9bd5ebbc4790e20d82fd19466dd18.tar.bz2 linux-stable-b5813891dad9bd5ebbc4790e20d82fd19466dd18.zip | |
dm-verity: align struct dm_verity_fec_io properly
commit 38bc1ab135db87577695816b190e7d6d8ec75879 upstream.
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@redhat.com>
Cc: stable@vger.kernel.org
Fixes: a739ff3f543a ("dm verity: add support for forward error correction")
Signed-off-by: Mike Snitzer <snitzer@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/md/dm-verity-fec.c | 3 | ||||
| -rw-r--r-- | drivers/md/dm-verity.h | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/drivers/md/dm-verity-fec.c b/drivers/md/dm-verity-fec.c index 0fe6cc3007f5..a819578408df 100644 --- a/drivers/md/dm-verity-fec.c +++ b/drivers/md/dm-verity-fec.c @@ -28,7 +28,8 @@ bool verity_fec_is_enabled(struct dm_verity *v) */ 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)); } /* diff --git a/drivers/md/dm-verity.h b/drivers/md/dm-verity.h index a59e0ada6fd3..5509d69fd29f 100644 --- a/drivers/md/dm-verity.h +++ b/drivers/md/dm-verity.h @@ -113,12 +113,6 @@ static inline u8 *verity_io_want_digest(struct dm_verity *v, 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, |