From: Greg Kroah-Hartman Date: Mon, 17 Jul 2023 19:50:21 +0000 (+0200) Subject: 5.10-stable patches X-Git-Tag: v6.1.39~10 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=116c1689598816352556ce4058cce5e823957119;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: block-partition-fix-signedness-issue-for-amiga-partitions.patch --- diff --git a/queue-5.10/block-partition-fix-signedness-issue-for-amiga-partitions.patch b/queue-5.10/block-partition-fix-signedness-issue-for-amiga-partitions.patch new file mode 100644 index 00000000000..e1ab73233b8 --- /dev/null +++ b/queue-5.10/block-partition-fix-signedness-issue-for-amiga-partitions.patch @@ -0,0 +1,39 @@ +From 7eb1e47696aa231b1a567846bbe3a1e1befe1854 Mon Sep 17 00:00:00 2001 +From: Michael Schmitz +Date: Wed, 5 Jul 2023 11:38:08 +1200 +Subject: block/partition: fix signedness issue for Amiga partitions + +From: Michael Schmitz + +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 +Link: https://lore.kernel.org/r/024ce4fa-cc6d-50a2-9aae-3701d0ebf668@xenosoft.de +Signed-off-by: Michael Schmitz +Reviewed-by: Martin Steigerwald +Tested-by: Christian Zigotzky +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + block/partitions/amiga.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/block/partitions/amiga.c ++++ b/block/partitions/amiga.c +@@ -91,7 +91,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", diff --git a/queue-5.10/series b/queue-5.10/series index 8dbb2cfd6f8..c84b9bcc7e5 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -332,3 +332,4 @@ tty-serial-fsl_lpuart-add-earlycon-for-imx8ulp-platform.patch rcu-tasks-mark-trc_reader_nesting-data-races.patch rcu-tasks-mark-trc_reader_special.b.need_qs-data-races.patch rcu-tasks-simplify-trc_read_check_handler-atomic-operations.patch +block-partition-fix-signedness-issue-for-amiga-partitions.patch