Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0272e78 authored by Peter Osterlund's avatar Peter Osterlund Committed by Linus Torvalds
Browse files

[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: default avatarPeter Osterlund <petero2@telia.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b9f0bd08

drivers/block/pktcdvd.c

+4 −1
Original line number Diff line number Diff line
@@ -946,7 +946,6 @@ static int pkt_handle_queue(struct pktcdvd_device *pd) 
	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 pktcdvd_device *pd) 
		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);