OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] pktcdvd: fix bogus BUG_ON 

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>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Peter Osterlund 2005-09-13 01:25:27 -07:00 committed by Linus Torvalds
parent b9f0bd0895
commit d0272e78ee
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/block/pktcdvd.c
View File

@ -946,7 +946,6 @@ try_next_bio:
pd->current_sector = zone + pd->settings.size; pd->current_sector = zone + pd->settings.size;
pkt->sector = zone; pkt->sector = zone;
pkt->frames = pd->settings.size >> 2; pkt->frames = pd->settings.size >> 2;
BUG_ON(pkt->frames > PACKET_MAX_SIZE);
pkt->write_size = 0; pkt->write_size = 0;
/* /*
@ -1636,6 +1635,10 @@ static int pkt_probe_settings(struct pktcdvd_device *pd)
printk("pktcdvd: detected zero packet size!\n"); printk("pktcdvd: detected zero packet size!\n");
pd->settings.size = 128; 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->settings.fp = ti.fp;
pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1); pd->offset = (be32_to_cpu(ti.track_start) << 2) & (pd->settings.size - 1);