Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752425AbWCFVII (ORCPT ); Mon, 6 Mar 2006 16:08:08 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752423AbWCFVII (ORCPT ); Mon, 6 Mar 2006 16:08:08 -0500 Received: from smtp.osdl.org ([65.172.181.4]:46750 "EHLO smtp.osdl.org") by vger.kernel.org with ESMTP id S1752426AbWCFVIG (ORCPT ); Mon, 6 Mar 2006 16:08:06 -0500 Date: Mon, 6 Mar 2006 13:07:48 -0800 (PST) From: Linus Torvalds To: Jesper Juhl cc: Linux Kernel Mailing List , Andrew Morton , markhe@nextd.demon.co.uk, Andrea Arcangeli , Mike Christie , James Bottomley , Jens Axboe Subject: Re: Slab corruption in 2.6.16-rc5-mm2 In-Reply-To: <9a8748490603061256h794c5af9wa6fbb616e8ddbd89@mail.gmail.com> Message-ID: References: <200603060117.16484.jesper.juhl@gmail.com> <200603062136.17098.jesper.juhl@gmail.com> <9a8748490603061253u5e4d7561vd4e566f5798a5f4@mail.gmail.com> <9a8748490603061256h794c5af9wa6fbb616e8ddbd89@mail.gmail.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1651 Lines: 48 On Mon, 6 Mar 2006, Jesper Juhl wrote: > > Hmm, is it just me or should that len= have read len=96 ??? > > This is the change I made : > > --- linux-2.6.16-rc5-mm2/block/scsi_ioctl.c~ 2006-03-06 > 21:43:56.000000000 +0100 > +++ linux-2.6.16-rc5-mm2/block/scsi_ioctl.c 2006-03-06 > 21:43:56.000000000 +0100 > @@ -568,7 +568,7 @@ int scsi_cmd_ioctl(struct file *file, st > hdr.dxferp = cgc.buffer; > hdr.sbp = cgc.sense; > if (hdr.sbp) > - hdr.mx_sb_len = sizeof(struct request_sense); > + hdr.mx_sb_len = SCSI_SENSE_BUFFERSIZE; > hdr.timeout = cgc.timeout; > hdr.cmdp = ((struct cdrom_generic_command __user*) arg)->cmd; > hdr.cmd_len = sizeof(cgc.cmd); > > did I mess up? That's not the one to change. It's the one in "sr_do_ioctl()", where it uses "sizeof(*sense)". Linus ---- diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c index 5d02ff4..b65462f 100644 --- a/drivers/scsi/sr_ioctl.c +++ b/drivers/scsi/sr_ioctl.c @@ -192,7 +192,7 @@ int sr_do_ioctl(Scsi_CD *cd, struct pack SDev = cd->device; if (!sense) { - sense = kmalloc(sizeof(*sense), GFP_KERNEL); + sense = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL); if (!sense) { err = -ENOMEM; goto out; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/