From: Peter Osterlund <petero2@telia.com>
In the packet writing driver, if the drive reports a packet size larger than
the driver can handle, bail out safely instead of triggering a BUG_ON.
Signed-off-by: Peter Osterlund <petero2@telia.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---
drivers/block/pktcdvd.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletion(-)
diff -puN drivers/block/pktcdvd.c~fix-bogus-bug_on-in-pktcdvd drivers/block/pktcdvd.c
--- devel/drivers/block/pktcdvd.c~fix-bogus-bug_on-in-pktcdvd 2005-09-11 12:33:31.000000000 -0700
+++ devel-akpm/drivers/block/pktcdvd.c 2005-09-11 12:33:31.000000000 -0700
@@ -946,7 +946,6 @@ try_next_bio:
pd->current_sector = zone + pd->settings.size;
pkt->sector = zone;
pkt->frames = pd->settings.size >> 2;
- BUG_ON(pkt->frames > PACKET_MAX_SIZE);
pkt->write_size = 0;
/*
@@ -1636,6 +1635,10 @@ static int pkt_probe_settings(struct pkt
printk("pktcdvd: detected zero packet size!\n");
pd->settings.size = 128;
}
+ if (pd->settings.size > PACKET_MAX_SECTORS) {
+ printk("pktcdvd: packet size is too big\n");
+ return -ENXIO;
+ }
pd->settings.fp = ti.fp;
pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);
_