FAILED: patch "[PATCH] block: add overflow checks for Amiga partition support" failed to apply to 5.4-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.4.y
git checkout FETCH_HEAD
git cherry-pick -x b6f3f28f604ba3de4724ad82bea6adb1300c0b5f
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023071117-convene-mockup-27f2@gregkh' --subject-prefix 'PATCH 5.4.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From b6f3f28f604ba3de4724ad82bea6adb1300c0b5f Mon Sep 17 00:00:00 2001
From: Michael Schmitz <[email protected]>
Date: Wed, 21 Jun 2023 08:17:25 +1200
Subject: [PATCH] block: add overflow checks for Amiga partition support
The Amiga partition parser module uses signed int for partition sector address and count, which will overflow for disks larger than 1 TB.
Use u64 as type for sector address and size to allow using disks up to 2 TB without LBD support, and disks larger than 2 TB with LBD. The RBD format allows to specify disk sizes up to 2^128 bytes (though native OS limitations reduce this somewhat, to max 2^68 bytes), so check for u64 overflow carefully to protect against overflowing sector_t.
Bail out if sector addresses overflow 32 bits on kernels without LBD support.
This bug was reported originally in 2012, and the fix was created by the RDB author, Joanne Dow <[email protected]>. A patch had been discussed and reviewed on linux-m68k at that time but never officially submitted (now resubmitted as patch 1 in this series).
This patch adds additional error checking and warning messages.
Message-ID: <[email protected]>
block/partitions/amiga.c +85 -18
@@ -11,10 +11,18 @@#define pr_fmt (fmt) fmt#include <linux/types.h> +#include <linux/mm_types.h> +#include <linux/overflow.h> #include <linux/affs_hardblocks.h> #include "check.h" +/* magic offsets in partition DosEnvVec */ +#define NR_HD 3 +#define NR_SECT 5 +#define LO_CYL 9 +#define HI_CYL 10 +static __inline__u32 checksum_block (__be32 *m,int size) {
@@ -31,9 +39,12 @@ int amiga_partition(struct parsed_partitions *state)unsigned char *data;struct RigidDiskBlock *rdb;struct PartitionBlock *pb; -sector_t start_sect, nr_sects; -int blk, part, res =0 ; -int blksize =1 ;/* Multiplier for disk block size */ +u64 start_sect, nr_sects; +sector_t blk, end_sect; +u32 cylblk;/* rdb_CylBlocks = nr_heads*sect_per_track */ +u32 nr_hd, nr_sect, lo_cyl, hi_cyl; +int part, res =0 ; +unsigned int blksize =1 ;/* Multiplier for disk block size */ int slot =1 ;for (blk =0 ; ; blk++,put_dev_sector (sect)) {
@@ -41,7 +52,7 @@ int amiga_partition(struct parsed_partitions *state) goto rdb_done; data =read_part_sector (state, blk, §);if (!data) { -pr_err ("Dev %s: unable to read RDB block %d\n" , +pr_err ("Dev %s: unable to read RDB block %llu\n" , state->disk->disk_name, blk); res =-1 ; goto rdb_done;
@@ -58,12 +69,12 @@ int amiga_partition(struct parsed_partitions *state) *(__be32 *)(data+0xdc ) =0 ;if (checksum_block ((__be32 *)data,be32_to_cpu (rdb->rdb_SummedLongs) &0x7F )==0 ) { -pr_err ("Trashed word at 0xd0 in block %d ignored in checksum calculation\n" , +pr_err ("Trashed word at 0xd0 in block %llu ignored in checksum calculation\n" , blk);break ; } -pr_err ("Dev %s: RDB in block %d has bad checksum\n" , +pr_err ("Dev %s: RDB in block %llu has bad checksum\n" , state->disk->disk_name, blk); }
@@ -80,10 +91,15 @@ 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)) { - blk *= blksize;/* Read in terms partition table understands */ +/* 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" , + state->disk->disk_name, blk, part); +break ; + } data =read_part_sector (state, blk, §);if (!data) { -pr_err ("Dev %s: unable to read partition block %d\n" , +pr_err ("Dev %s: unable to read partition block %llu\n" , state->disk->disk_name, blk); res =-1 ; goto rdb_done;
@@ -95,19 +111,70 @@ int amiga_partition(struct parsed_partitions *state)if (checksum_block ((__be32 *)pb,be32_to_cpu (pb->pb_SummedLongs) &0x7F ) !=0 )continue ; -/* Tell Kernel about it */ +/* RDB gives us more than enough rope to hang ourselves with, +* many times over (2^128 bytes if all fields max out). +* Some careful checks are in order, so check for potential +* overflows. +* We are multiplying four 32 bit numbers to one sector_t! +*/ + + nr_hd =be32_to_cpu (pb->pb_Environment[NR_HD ]); + nr_sect =be32_to_cpu (pb->pb_Environment[NR_SECT ]); + +/* CylBlocks is total number of blocks per cylinder */ +if (check_mul_overflow (nr_hd, nr_sect, &cylblk)) { +pr_err ("Dev %s: heads*sects %u overflows u32, skipping partition!\n" , + state->disk->disk_name, cylblk); +continue ; + } + +/* check for consistency with RDB defined CylBlocks */ +if (cylblk >be32_to_cpu (rdb->rdb_CylBlocks)) { +pr_warn ("Dev %s: cylblk %u > rdb_CylBlocks %u!\n" , + state->disk->disk_name, cylblk, +be32_to_cpu (rdb->rdb_CylBlocks)); + } + +/* RDB allows for variable logical block size - +* normalize to 512 byte blocks and check result. +*/ + +if (check_mul_overflow (cylblk, blksize, &cylblk)) { +pr_err ("Dev %s: partition %u bytes per cyl. overflows u32, skipping partition!\n" , + state->disk->disk_name, part); +continue ; + } + +/* Calculate partition start and end. Limit of 32 bit on cylblk +* guarantees no overflow occurs if LBD support is enabled. +*/ + + lo_cyl =be32_to_cpu (pb->pb_Environment[LO_CYL ]); + start_sect = ((u64 ) lo_cyl * cylblk); + + hi_cyl =be32_to_cpu (pb->pb_Environment[HI_CYL ]); + nr_sects = (((u64 ) hi_cyl - lo_cyl +1 ) * cylblk); - nr_sects = ((sector_t )be32_to_cpu (pb->pb_Environment[10 ]) +1 - -be32_to_cpu (pb->pb_Environment[9 ])) * -be32_to_cpu (pb->pb_Environment[3 ]) * -be32_to_cpu (pb->pb_Environment[5 ]) * - blksize;if (!nr_sects)continue ; - start_sect = (sector_t )be32_to_cpu (pb->pb_Environment[9 ]) * -be32_to_cpu (pb->pb_Environment[3 ]) * -be32_to_cpu (pb->pb_Environment[5 ]) * - blksize; + +/* Warn user if partition end overflows u32 (AmigaDOS limit) */ + +if ((start_sect + nr_sects) >UINT_MAX ) { +pr_warn ("Dev %s: partition %u (%llu-%llu) needs 64 bit device support!\n" , + state->disk->disk_name, part, + start_sect, start_sect + nr_sects); + } + +if (check_add_overflow (start_sect, nr_sects, &end_sect)) { +pr_err ("Dev %s: partition %u (%llu-%llu) needs LBD device support, skipping partition!\n" , + state->disk->disk_name, part, + start_sect, end_sect); +continue ; + } + +/* Tell Kernel about it */ +put_partition (state,slot++,start_sect,nr_sects); {/* Be even more informative to aid mounting */
PATCH 1/1 block: add overflow checks for Amiga partition support
The Amiga partition parser module uses signed int for partition sector address and count, which will overflow for disks larger than 1 TB.
Use u64 as type for sector address and size to allow using disks up to 2 TB without LBD support, and disks larger than 2 TB with LBD. The RBD format allows to specify disk sizes up to 2^128 bytes (though native OS limitations reduce this somewhat, to max 2^68 bytes), so check for u64 overflow carefully to protect against overflowing sector_t.
Bail out if sector addresses overflow 32 bits on kernels without LBD support.
This bug was reported originally in 2012, and the fix was created by the RDB author, Joanne Dow <[email protected]>. A patch had been discussed and reviewed on linux-m68k at that time but never officially submitted (now resubmitted as patch 1 in this series).
This patch adds additional error checking and warning messages.
Message-ID: <[email protected]>
---
Changes from linux-block:
- fix merge conflict in 5.4-stable
--- block/partitions/amiga.c | 103 ++++++++++++++++++++++++++++++++------- 1 file changed, 85 insertions(+), 18 deletions(-)
block/partitions/amiga.c +85 -18
@@ -11,11 +11,19 @@#define pr_fmt (fmt) fmt#include <linux/types.h> +#include <linux/mm_types.h> +#include <linux/overflow.h> #include <linux/affs_hardblocks.h> #include "check.h" #include "amiga.h" +/* magic offsets in partition DosEnvVec */ +#define NR_HD 3 +#define NR_SECT 5 +#define LO_CYL 9 +#define HI_CYL 10 +static __inline__u32 checksum_block (__be32 *m,int size) {
@@ -32,9 +40,12 @@ int amiga_partition(struct parsed_partitions *state)unsigned char *data;struct RigidDiskBlock *rdb;struct PartitionBlock *pb; -sector_t start_sect, nr_sects; -int blk, part, res =0 ; -int blksize =1 ;/* Multiplier for disk block size */ +u64 start_sect, nr_sects; +sector_t blk, end_sect; +u32 cylblk;/* rdb_CylBlocks = nr_heads*sect_per_track */ +u32 nr_hd, nr_sect, lo_cyl, hi_cyl; +int part, res =0 ; +unsigned int blksize =1 ;/* Multiplier for disk block size */ int slot =1 ;char b[BDEVNAME_SIZE ];
@@ -44,7 +55,7 @@ int amiga_partition(struct parsed_partitions *state) data =read_part_sector (state, blk, §);if (!data) {if (warn_no_part) -pr_err ("Dev %s: unable to read RDB block %d\n" , +pr_err ("Dev %s: unable to read RDB block %llu\n" ,bdevname (state->bdev, b), blk); res =-1 ; goto rdb_done;
@@ -61,12 +72,12 @@ int amiga_partition(struct parsed_partitions *state) *(__be32 *)(data+0xdc ) =0 ;if (checksum_block ((__be32 *)data,be32_to_cpu (rdb->rdb_SummedLongs) &0x7F )==0 ) { -pr_err ("Trashed word at 0xd0 in block %d ignored in checksum calculation\n" , +pr_err ("Trashed word at 0xd0 in block %llu ignored in checksum calculation\n" , blk);break ; } -pr_err ("Dev %s: RDB in block %d has bad checksum\n" , +pr_err ("Dev %s: RDB in block %llu has bad checksum\n" ,bdevname (state->bdev, b), blk); }
@@ -83,11 +94,16 @@ 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)) { - blk *= blksize;/* Read in terms partition table understands */ +/* 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" , +bdevname (state->bdev, b), blk, part); +break ; + } data =read_part_sector (state, blk, §);if (!data) {if (warn_no_part) -pr_err ("Dev %s: unable to read partition block %d\n" , +pr_err ("Dev %s: unable to read partition block %llu\n" ,bdevname (state->bdev, b), blk); res =-1 ; goto rdb_done;
@@ -99,19 +115,70 @@ int amiga_partition(struct parsed_partitions *state)if (checksum_block ((__be32 *)pb,be32_to_cpu (pb->pb_SummedLongs) &0x7F ) !=0 )continue ; -/* Tell Kernel about it */ +/* RDB gives us more than enough rope to hang ourselves with, +* many times over (2^128 bytes if all fields max out). +* Some careful checks are in order, so check for potential +* overflows. +* We are multiplying four 32 bit numbers to one sector_t! +*/ + + nr_hd =be32_to_cpu (pb->pb_Environment[NR_HD ]); + nr_sect =be32_to_cpu (pb->pb_Environment[NR_SECT ]); + +/* CylBlocks is total number of blocks per cylinder */ +if (check_mul_overflow (nr_hd, nr_sect, &cylblk)) { +pr_err ("Dev %s: heads*sects %u overflows u32, skipping partition!\n" , +bdevname (state->bdev, b), cylblk); +continue ; + } + +/* check for consistency with RDB defined CylBlocks */ +if (cylblk >be32_to_cpu (rdb->rdb_CylBlocks)) { +pr_warn ("Dev %s: cylblk %u > rdb_CylBlocks %u!\n" , +bdevname (state->bdev, b), cylblk, +be32_to_cpu (rdb->rdb_CylBlocks)); + } + +/* RDB allows for variable logical block size - +* normalize to 512 byte blocks and check result. +*/ + +if (check_mul_overflow (cylblk, blksize, &cylblk)) { +pr_err ("Dev %s: partition %u bytes per cyl. overflows u32, skipping partition!\n" , +bdevname (state->bdev, b), part); +continue ; + } + +/* Calculate partition start and end. Limit of 32 bit on cylblk +* guarantees no overflow occurs if LBD support is enabled. +*/ + + lo_cyl =be32_to_cpu (pb->pb_Environment[LO_CYL ]); + start_sect = ((u64 ) lo_cyl * cylblk); + + hi_cyl =be32_to_cpu (pb->pb_Environment[HI_CYL ]); + nr_sects = (((u64 ) hi_cyl - lo_cyl +1 ) * cylblk); - nr_sects = ((sector_t )be32_to_cpu (pb->pb_Environment[10 ]) +1 - -be32_to_cpu (pb->pb_Environment[9 ])) * -be32_to_cpu (pb->pb_Environment[3 ]) * -be32_to_cpu (pb->pb_Environment[5 ]) * - blksize;if (!nr_sects)continue ; - start_sect = (sector_t )be32_to_cpu (pb->pb_Environment[9 ]) * -be32_to_cpu (pb->pb_Environment[3 ]) * -be32_to_cpu (pb->pb_Environment[5 ]) * - blksize; + +/* Warn user if partition end overflows u32 (AmigaDOS limit) */ + +if ((start_sect + nr_sects) >UINT_MAX ) { +pr_warn ("Dev %s: partition %u (%llu-%llu) needs 64 bit device support!\n" , +bdevname (state->bdev, b), part, + start_sect, start_sect + nr_sects); + } + +if (check_add_overflow (start_sect, nr_sects, &end_sect)) { +pr_err ("Dev %s: partition %u (%llu-%llu) needs LBD device support, skipping partition!\n" , +bdevname (state->bdev, b), part, + start_sect, end_sect); +continue ; + } + +/* Tell Kernel about it */ +put_partition (state,slot++,start_sect,nr_sects); {/* Be even more informative to aid mounting */
Signature · 1 line
2.17.1
RE: [PATCH 5.4.y] block: add overflow checks for Amiga partition support
From: Michael Schmitz
Quoted 9 lines
Sent: 16 July 2023 00:27
The Amiga partition parser module uses signed int for partition sector address and count, which will overflow for disks larger than 1 TB.
Use u64 as type for sector address and size to allow using disks up to 2 TB without LBD support, and disks larger than 2 TB with LBD. The RBD format allows to specify disk sizes up to 2^128 bytes (though native OS limitations reduce this somewhat, to max 2^68 bytes),
Pretty much everything (including the mass of an proton) stops you having a disk with anywhere near 2^64 bytes in it.
David
Quoted 2 lines
so check for
u64 overflow carefully to protect against overflowingsector_t.
-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)
Re: [PATCH 5.4.y] block: add overflow checks for Amiga partition support
Hi David,
Quoted 6 lines · David Laight
From: Michael Schmitz
Quoted 5 lines
Sent: 16 July 2023 00:27
The Amiga partition parser module uses signed int for partition sector address and count, which will overflow for disks larger than 1 TB.
Quoted 6 lines
Quoted 4 lines
Use u64 as type for sector address and size to allow using disks up to 2 TB without LBD support, and disks larger than 2 TB with LBD. The RBD format allows to specify disk sizes up to 2^128 bytes (though native OS limitations reduce this somewhat, to max 2^68 bytes),
Pretty much everything (including the mass of an proton) stops you having a disk with anywhere near 2^64 bytes in it.
I put my hopes on all that dark matter we still seem to be missing then.
Seriously though - RDB allows for this size, no matter how unlikely. 2^32 heads or 2^32 sectors per track would have been seen as impossible when RDB was designed. On the other hand, the '16 bit address space ought to be enough for everybody' was probably still fresh in the mind of the Amiga developers at that time.
All that matters is that we get the size calculations right (and then let the partition core enforce the known disk size limit).
Cheers,
Michael
Quoted 9 lines
David
Quoted 2 lines
so check for
u64 overflow carefully to protect against overflowingsector_t.-
Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)