Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754600AbYCLQzA (ORCPT ); Wed, 12 Mar 2008 12:55:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752625AbYCLQyu (ORCPT ); Wed, 12 Mar 2008 12:54:50 -0400 Received: from accolon.hansenpartnership.com ([76.243.235.52]:53522 "EHLO accolon.hansenpartnership.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752444AbYCLQyt (ORCPT ); Wed, 12 Mar 2008 12:54:49 -0400 Subject: Re: [PATCH resend] isd200: Allocate sense_buffer for hacked up scsi_cmnd From: James Bottomley To: Boaz Harrosh Cc: Alan Stern , Matthew Dharm , Sven Schnelle , linux-kernel@vger.kernel.org, linux-scsi , FUJITA Tomonori , Andrew Morton In-Reply-To: <47D7F5A3.9010004@panasas.com> References: <47D7F5A3.9010004@panasas.com> Content-Type: text/plain Date: Wed, 12 Mar 2008 11:54:44 -0500 Message-Id: <1205340884.2941.112.camel@localhost.localdomain> Mime-Version: 1.0 X-Mailer: Evolution 2.12.3 (2.12.3-3.fc8) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2918 Lines: 89 On Wed, 2008-03-12 at 17:24 +0200, Boaz Harrosh wrote: > On Wed, Mar 12 2008 at 17:10 +0200, Alan Stern wrote: > > On Wed, 12 Mar 2008, Boaz Harrosh wrote: > > > >> Since the separation of sense_buffer from scsi_cmnd, Drivers that hack their > >> own struct scsi_cmnd like here isd200, must also take care of their own > >> sense_buffer. > > > > Did you run this through checkpatch? > > > > Acked-by: Alan Stern > > > > Alan Stern > > > > -- > No I did not, Thanks. Here it is again. > Again this is for 2.6.25 rc-fixes a NULL dereference bugfix! > > --- > From: Boaz Harrosh > Date: Tue, 11 Mar 2008 17:23:06 +0200 > Subject: [PATCH] isd200: Allocate sense_buffer for hacked up scsi_cmnd > > Since the separation of sense_buffer from scsi_cmnd, Drivers that hack their > own struct scsi_cmnd like here isd200, must also take care of their own > sense_buffer. > > Signed-off-by: Boaz Harrosh > --- > drivers/usb/storage/isd200.c | 8 ++++++-- > 1 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/usb/storage/isd200.c b/drivers/usb/storage/isd200.c > index 2ae1e86..ac1764b 100644 > --- a/drivers/usb/storage/isd200.c > +++ b/drivers/usb/storage/isd200.c > @@ -294,6 +294,7 @@ struct isd200_info { > unsigned char MaxLUNs; > struct scsi_cmnd srb; > struct scatterlist sg; > + u8 *sense_buffer; There's no real need to add this parameter, since all you're doing is assigning it to srb.sense_buffer, there's no need to have an extra pointer for it. > }; > > > @@ -1469,6 +1470,7 @@ static void isd200_free_info_ptrs(void *info_) > if (info) { > kfree(info->id); > kfree(info->RegsBuf); > + kfree(info->sense_buffer); > } > } > > @@ -1494,11 +1496,13 @@ static int isd200_init_info(struct us_data *us) > kzalloc(sizeof(struct hd_driveid), GFP_KERNEL); > info->RegsBuf = (unsigned char *) > kmalloc(sizeof(info->ATARegs), GFP_KERNEL); > - if (!info->id || !info->RegsBuf) { > + info->sense_buffer = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL); ^ kzalloc is probably best > + if (!info->id || !info->RegsBuf || !info->sense_buffer) { > isd200_free_info_ptrs(info); > kfree(info); Needs to be a kfree(info->sense_buffer) to avoid leaks if the others couldn't allocate ... it also looks like there are missing kfree(info->id) and (info->RegsBuf) that fix leaks that aren't part of this patch. > retStatus = ISD200_ERROR; > - } > + } else > + info->srb.sense_buffer = info->sense_buffer; > } > > if (retStatus == ISD200_GOOD) { James -- 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/