Commit f716d830 authored Mar 06, 2006 by Linus Torvalds

Allocate 96 bytes for SCSI sense data reply



The SCSI layer uses SCSI_SENSE_BUFFERSIZE (96) for the sense buffer
size, even though some other code uses "sizeof(struct request_sense)"
(which is 64 bytes).  Allocate the buffer using the bigger of the two
for safety.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent 8ba7b0a1

drivers/scsi/sr_ioctl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -192,7 +192,7 @@ int sr_do_ioctl(Scsi_CD cd, struct packet_command cgc)
		SDev = cd->device;

		if (!sense) {
		sense = kmalloc(sizeof(*sense), GFP_KERNEL);
		sense = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
		if (!sense) {
		err = -ENOMEM;
		goto out;