Skip to content

Commit 08c1af8

Browse files
Mikulas PatockaMike Snitzer
authored andcommitted
dm integrity: fix memory corruption when tag_size is less than digest size
It is possible to set up dm-integrity in such a way that the "tag_size" parameter is less than the actual digest size. In this situation, a part of the digest beyond tag_size is ignored. In this case, dm-integrity would write beyond the end of the ic->recalc_tags array and corrupt memory. The corruption happened in integrity_recalc->integrity_sector_checksum->crypto_shash_final. Fix this corruption by increasing the tags array so that it has enough padding at the end to accomodate the loop in integrity_recalc() being able to write a full digest size for the last member of the tags array. Cc: stable@vger.kernel.org # v4.19+ Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Mike Snitzer <snitzer@kernel.org>
1 parent ce522ba commit 08c1af8

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

drivers/md/dm-integrity.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4399,6 +4399,7 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned argc, char **argv)
43994399
}
44004400

44014401
if (ic->internal_hash) {
4402+
size_t recalc_tags_size;
44024403
ic->recalc_wq = alloc_workqueue("dm-integrity-recalc", WQ_MEM_RECLAIM, 1);
44034404
if (!ic->recalc_wq ) {
44044405
ti->error = "Cannot allocate workqueue";
@@ -4412,8 +4413,10 @@ static int dm_integrity_ctr(struct dm_target *ti, unsigned argc, char **argv)
44124413
r = -ENOMEM;
44134414
goto bad;
44144415
}
4415-
ic->recalc_tags = kvmalloc_array(RECALC_SECTORS >> ic->sb->log2_sectors_per_block,
4416-
ic->tag_size, GFP_KERNEL);
4416+
recalc_tags_size = (RECALC_SECTORS >> ic->sb->log2_sectors_per_block) * ic->tag_size;
4417+
if (crypto_shash_digestsize(ic->internal_hash) > ic->tag_size)
4418+
recalc_tags_size += crypto_shash_digestsize(ic->internal_hash) - ic->tag_size;
4419+
ic->recalc_tags = kvmalloc(recalc_tags_size, GFP_KERNEL);
44174420
if (!ic->recalc_tags) {
44184421
ti->error = "Cannot allocate tags for recalculating";
44194422
r = -ENOMEM;

0 commit comments

Comments
 (0)