From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752863Ab1HVOg0 (ORCPT ); Mon, 22 Aug 2011 10:36:26 -0400 Received: from mgw2.diku.dk ([130.225.96.92]:50050 "EHLO mgw2.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752271Ab1HVOgY (ORCPT ); Mon, 22 Aug 2011 10:36:24 -0400 Date: Mon, 22 Aug 2011 16:36:16 +0200 (CEST) From: Julia Lawall To: Jesper Juhl Cc: Robert Love , kernel-janitors@vger.kernel.org, "James E.J. Bottomley" , devel@open-fcoe.org, linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/4] drivers/scsi/fcoe/fcoe.c: add missing test In-Reply-To: Message-ID: References: <1314021636-11528-2-git-send-email-julia@diku.dk> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 22 Aug 2011, Jesper Juhl wrote: > On Mon, 22 Aug 2011, Julia Lawall wrote: > > > From: Julia Lawall > > > > The initializations of both fcoe_nport_scsi_transport and > > fcoe_vport_scsi_transport can fail, so test both of them. > > > > The semantic match that finds this problem is as follows: > > (http://coccinelle.lip6.fr/) > > > > // > > @r@ > > identifier x,y,f!={PTR_ERR,ERR_PTR,ERR_CAST}; > > statement S; > > @@ > > > > x = f(...); > > ( > > if (\(x == NULL\|IS_ERR(x)\)) S > > | > > *if (\(y == NULL\|IS_ERR(y)\)) > > { ... when != x > > return ...; } > > ) > > // > > > > Signed-off-by: Julia Lawall > > > > --- > > drivers/scsi/fcoe/fcoe.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c > > index ba710e3..921b636 100644 > > --- a/drivers/scsi/fcoe/fcoe.c > > +++ b/drivers/scsi/fcoe/fcoe.c > > @@ -1096,7 +1096,7 @@ static int __init fcoe_if_init(void) > > fcoe_vport_scsi_transport = > > fc_attach_transport(&fcoe_vport_fc_functions); > > > > - if (!fcoe_nport_scsi_transport) { > > + if (!fcoe_nport_scsi_transport || !fcoe_vport_scsi_transport) { > > printk(KERN_ERR "fcoe: Failed to attach to the FC transport\n"); > > return -ENODEV; > > } > > > > I only took a quick look, so I may have overlooked something, so bear with > me. > > fc_attach_transport() allocates memory with kzalloc. If either call fails > the other may have succeeded and we'll leak the memory allocated to one of > them. > > Shouldn't we be kfree()'ing the two variables before the 'return -ENODEV'? It seems reasonable. julia