summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorMichael Schmitz <schmitzmic@gmail.com>2023-07-05 11:38:08 +1200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-07-27 08:37:29 +0200
commit373b9475ea8c2d18c7207b5aef75811054e3b461 (patch)
treeab38db064938336bc6579ea3b32828d2287b92b2 /block
parent22df19fee7b98d9f06641a8cfc4b8e658f3769d2 (diff)
block/partition: fix signedness issue for Amiga partitions
commit 7eb1e47696aa231b1a567846bbe3a1e1befe1854 upstream. Making 'blk' sector_t (i.e. 64 bit if LBD support is active) fails the 'blk>0' test in the partition block loop if a value of (signed int) -1 is used to mark the end of the partition block list. Explicitly cast 'blk' to signed int to allow use of -1 to terminate the partition block linked list. Fixes: b6f3f28f604b ("block: add overflow checks for Amiga partition support") Reported-by: Christian Zigotzky <chzigotzky@xenosoft.de> Link: https://lore.kernel.org/r/024ce4fa-cc6d-50a2-9aae-3701d0ebf668@xenosoft.de Signed-off-by: Michael Schmitz <schmitzmic@gmail.com> Reviewed-by: Martin Steigerwald <martin@lichtvoll.de> Tested-by: Christian Zigotzky <chzigotzky@xenosoft.de> Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'block')
-rw-r--r--block/partitions/amiga.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/partitions/amiga.c b/block/partitions/amiga.c
index a38fe08778c3..484a51bce39b 100644
--- a/block/partitions/amiga.c
+++ b/block/partitions/amiga.c
@@ -93,7 +93,7 @@ int amiga_partition(struct parsed_partitions *state)
}
blk = be32_to_cpu(rdb->rdb_PartitionList);
put_dev_sector(sect);
- for (part = 1; blk>0 && part<=16; part++, put_dev_sector(sect)) {
+ for (part = 1; (s32) blk>0 && part<=16; part++, put_dev_sector(sect)) {
/* Read in terms partition table understands */
if (check_mul_overflow(blk, (sector_t) blksize, &blk)) {
pr_err("Dev %s: overflow calculating partition block %llu! Skipping partitions %u and beyond\n",