From 759502a4b8b587037d062028bfde18048c36ea3e Mon Sep 17 00:00:00 2001 From: Eric Biggers Date: Wed, 10 Jun 2020 13:56:07 -0700 Subject: [PATCH] ANDROID: dm-default-key: avoid truncating the logical block size Upstream commit ad6bf88a6c19 ("block: fix an integer overflow in logical block size") changed queue_limits::logical_block_size from 'unsigned short' to 'unsigned int', and this commit has been backported to the LTS branches. Update the computation in default_key_io_hints() to match. This mirrors upstream commit 64611a15ca9d ("dm crypt: avoid truncating the logical block size") which fixed the same bug in dm-crypt. Fixes: cb39ec0c1040 ("ANDROID: dm: add dm-default-key target for metadata encryption") Change-Id: I98dd65afdb120073203af3b201d0831edd6e245c Signed-off-by: Eric Biggers --- drivers/md/dm-default-key.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/md/dm-default-key.c b/drivers/md/dm-default-key.c index 8af272e27de8..35f9c806097f 100644 --- a/drivers/md/dm-default-key.c +++ b/drivers/md/dm-default-key.c @@ -386,7 +386,7 @@ static void default_key_io_hints(struct dm_target *ti, const unsigned int sector_size = dkc->sector_size; limits->logical_block_size = - max_t(unsigned short, limits->logical_block_size, sector_size); + max_t(unsigned int, limits->logical_block_size, sector_size); limits->physical_block_size = max_t(unsigned int, limits->physical_block_size, sector_size); limits->io_min = max_t(unsigned int, limits->io_min, sector_size);