aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@redhat.com>2007-02-16 20:40:20 -0500
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2007-02-16 20:40:20 -0500
commitfdb77da4ca68ae17a39d58c9d5c00479a7e124c0 (patch)
tree7dbeb5c579c3e067c5f8c6dedef243c2638fcf7f
parent39baf8a798926eb675c9360d5822ca86ed92866e (diff)
ide-floppy: Fix unformatted media crash
A ZIP or similar with unformatted media will cause crashes when attempts are made to read/write it in some cases. This is because bs_factor is zero and we divide by it causing an oops. As the size of a non-accessible/non-existant media is really a bit of a zen question it doesn't matter if non-existant media is 512 bytes per sector or zero. Setting it to 1 causes us to generate 512 bytes/sector accesses and error properly. Based on a fix found lurking in an ancient bugzilla entry since about 2004 (ugghhh) Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
-rw-r--r--drivers/ide/ide-floppy.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c
index d33717c8afd4..07fa37d84df2 100644
--- a/drivers/ide/ide-floppy.c
+++ b/drivers/ide/ide-floppy.c
@@ -1433,7 +1433,8 @@ static int idefloppy_get_capacity (ide_drive_t *drive)
1433 1433
1434 drive->bios_cyl = 0; 1434 drive->bios_cyl = 0;
1435 drive->bios_head = drive->bios_sect = 0; 1435 drive->bios_head = drive->bios_sect = 0;
1436 floppy->blocks = floppy->bs_factor = 0; 1436 floppy->blocks = 0;
1437 floppy->bs_factor = 1;
1437 set_capacity(floppy->disk, 0); 1438 set_capacity(floppy->disk, 0);
1438 1439
1439 idefloppy_create_read_capacity_cmd(&pc); 1440 idefloppy_create_read_capacity_cmd(&pc);