On Friday October 13, [email protected] wrote:
> Ar Gwe, 2006-10-13 am 09:50 +1000, ysgrifennodd Neil Brown:
> > So: Is there any good reason to not clip the partitions to fit
> > within the device - and discard those that are completely beyond
> > the end of the device??
>
> Its close but not quite the right approach
>
> > The patch at the end of the mail does that. Is it OK to submit this
> > to mainline?
>
> No I think not. Any partition which is partly outside the disk should be
> ignored entirely, that ensures it doesn't accidentally get mounted and
> trashed by an HPA or similar mixup.
Hmmm.. So Alan things a partially-outside-this-disk partition
shouldn't show up at all, and Andries thinks it should.
And both give reasonably believable justifications.
Maybe we need a kernel parameter? How about this?
NeilBrown
-----------------------------
Don't allow partitions to start or end beyond the end of the device.
Corrupt partitions tables can cause wierd partitions that confuse
programs. This is confusion that can be avoided.
If a partition appears to start at or beyond the end of a device, we
don't enable it.
If it starts within the device but ends after the end, we clip it to
fit within the device.
Not enabling partitions does not affect partition numbering of
subsequent partitions.
This change applies to partitions found by fs/partitions/check.c
and to partitions explicitly created via an ioctl.
There is no uniform agreement on whether partitions that extend
beyond the end of the device should be clipped or discarded.
Discarding is safer as it makes corruption less likely.
Clipping is more flexable and gives continued access to the partition.
So provide a kernel-parameter which a 'safe' default.
partitions=strict
is the default
partitions=relaxed
means that partitions are clipped rather than rejected.
This kernel parameters only applies to auto-detected partitions,
not those set by ioctl.
Signed-off-by: Neil Brown <[email protected]>
### Diffstat output
./Documentation/kernel-parameters.txt | 8 ++++++++
./block/ioctl.c | 6 ++++++
./fs/partitions/check.c | 28 ++++++++++++++++++++++++++--
3 files changed, 40 insertions(+), 2 deletions(-)
diff .prev/Documentation/kernel-parameters.txt ./Documentation/kernel-parameters.txt
--- .prev/Documentation/kernel-parameters.txt 2006-10-16 10:03:40.000000000 +1000
+++ ./Documentation/kernel-parameters.txt 2006-10-16 10:06:42.000000000 +1000
@@ -1148,6 +1148,14 @@ and is between 256 and 4096 characters.
Currently this function knows 686a and 8231 chips.
Format: [spp|ps2|epp|ecp|ecpepp]
+ partitions= How to interpret partition information that
+ could be corrupt.
+ 'strict' is the default. Partitions that
+ don't fit in the device are rejected.
+ 'relaxed' is an option. Partitions that start
+ within the device be end beyond the end are
+ clipped.
+
pas2= [HW,OSS] Format:
<io>,<irq>,<dma>,<dma16>,<sb_io>,<sb_irq>,<sb_dma>,<sb_dma16>
diff .prev/block/ioctl.c ./block/ioctl.c
--- .prev/block/ioctl.c 2006-10-13 14:30:56.000000000 +1000
+++ ./block/ioctl.c 2006-10-16 09:54:40.000000000 +1000
@@ -42,6 +42,12 @@ static int blkpg_ioctl(struct block_devi
|| pstart < 0 || plength < 0)
return -EINVAL;
}
+ /* Does partition fit within device */
+ if (start + length > get_capacity(disk)) {
+ if (start >= get_capacity(disk))
+ return -EINVAL;
+ length = get_capacity(disk) - start;
+ }
/* partition number in use? */
mutex_lock(&bdev->bd_mutex);
if (disk->part[part - 1]) {
diff .prev/fs/partitions/check.c ./fs/partitions/check.c
--- .prev/fs/partitions/check.c 2006-10-13 14:30:56.000000000 +1000
+++ ./fs/partitions/check.c 2006-10-16 10:07:53.000000000 +1000
@@ -443,6 +443,8 @@ exit:
}
}
+static int strict_partitions = 1;
+
int rescan_partitions(struct gendisk *disk, struct block_device *bdev)
{
struct parsed_partitions *state;
@@ -466,8 +468,22 @@ int rescan_partitions(struct gendisk *di
if (!size)
continue;
if (from + size > get_capacity(disk)) {
- printk(" %s: p%d exceeds device capacity\n",
- disk->disk_name, p);
+ if (strict_partitions) {
+ printk(KERN_INFO
+ " %s: p%d ends beyond end of device"
+ " - ignoring\n", disk->disk_name, p);
+ continue;
+ }
+ if (from >= get_capacity(disk)) {
+ printk(KERN_INFO
+ " %s: p%d starts beyond end of device"
+ " - ignoring\n", disk->disk_name, p);
+ continue;
+ }
+ printk(KERN_INFO
+ " %s: p%d exceeds device capacity - clipping\n",
+ disk->disk_name, p);
+ size = get_capacity(disk) - from;
}
add_partition(disk, p, from, size);
#ifdef CONFIG_BLK_DEV_MD
@@ -479,6 +495,14 @@ int rescan_partitions(struct gendisk *di
return 0;
}
+static int __init part_setup(char *str)
+{
+ strict_partitions = strcmp(str, "relaxed");
+ return 1;
+}
+
+__setup("partitions=", part_setup);
+
unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
{
struct address_space *mapping = bdev->bd_inode->i_mapping;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
