On Fri, Aug 7, 2009 at 22:17, Davidlohr Bueso A.<dave@xxxxxxx> wrote: > On Fri, Aug 07, 2009 at 09:56:48PM +0200, Julia Lawall wrote: >> On Fri, 7 Aug 2009, Davidlohr Bueso A. wrote: >> >> > On Fri, Aug 07, 2009 at 08:54:44PM +0200, Julia Lawall wrote: >> > > On Fri, 7 Aug 2009, Davidlohr Bueso A. wrote: >> > > >> > > > Verify that ch->dt is not NULL before using it: >> > > > ch-dt[elem] = value; >> > > >> > > It looks like buffer should be freed as well? >> > >> > The way I see it, this is done in ch_remove() >> >> I don't see that at all. buffer appears to be a variable that is local to >> ch_readconfig and is passed down to other functions, but never saved >> anywhere. Furthermore buffer is freed in the normal exit of the function, >> so it seems likely that it should be freed on an early exit as well. > > Sorry, misread, for some reason I thought you were talking about freeing ch->dt, correting patch. > > Thanks, > Davidlohr > > Signed-off-by: Davidlohr Bueso <dave@xxxxxxx> > > --- > drivers/scsi/ch.c | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c > index 7b1633a..bb42ceb 100644 > --- a/drivers/scsi/ch.c > +++ b/drivers/scsi/ch.c > @@ -353,6 +353,12 @@ ch_readconfig(scsi_changer *ch) > /* look up the devices of the data transfer elements */ > ch->dt = kmalloc(ch->counts[CHET_DT]*sizeof(struct scsi_device), > GFP_KERNEL); > + > + if (!ch->dt) { > + free(buffer); kfree(buffer) ? > + return -ENOMEM; > + } > + > for (elem = 0; elem < ch->counts[CHET_DT]; elem++) { > id = -1; > lun = 0; > -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html