| From 7eb1e47696aa231b1a567846bbe3a1e1befe1854 Mon Sep 17 00:00:00 2001 |
| From: Michael Schmitz <schmitzmic@gmail.com> |
| Date: Wed, 5 Jul 2023 11:38:08 +1200 |
| Subject: block/partition: fix signedness issue for Amiga partitions |
| |
| From: Michael Schmitz <schmitzmic@gmail.com> |
| |
| 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> |
| --- |
| block/partitions/amiga.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/block/partitions/amiga.c |
| +++ b/block/partitions/amiga.c |
| @@ -93,7 +93,7 @@ int amiga_partition(struct parsed_partit |
| } |
| 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", |
