From 4b277cb83cb07a99d7aba73dc629283a4a1d8fc8 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 17 Jul 2023 21:50:04 +0200 Subject: [PATCH] 5.4-stable patches added patches: block-partition-fix-signedness-issue-for-amiga-partitions.patch --- ...ignedness-issue-for-amiga-partitions.patch | 39 +++++++++++++++++++ queue-5.4/series | 1 + 2 files changed, 40 insertions(+) create mode 100644 queue-5.4/block-partition-fix-signedness-issue-for-amiga-partitions.patch diff --git a/queue-5.4/block-partition-fix-signedness-issue-for-amiga-partitions.patch b/queue-5.4/block-partition-fix-signedness-issue-for-amiga-partitions.patch new file mode 100644 index 00000000000..f60185df57a --- /dev/null +++ b/queue-5.4/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 +@@ -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", diff --git a/queue-5.4/series b/queue-5.4/series index 221b039e194..a5947971b8c 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -191,3 +191,4 @@ netfilter-nf_tables-fix-scheduling-while-atomic-splat.patch netfilter-conntrack-avoid-nf_ct_helper_hash-uses-after-free.patch netfilter-nf_tables-prevent-oob-access-in-nft_byteorder_eval.patch tty-serial-fsl_lpuart-add-earlycon-for-imx8ulp-platform.patch +block-partition-fix-signedness-issue-for-amiga-partitions.patch -- 2.47.3