From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965940AbbBCEQ5 (ORCPT ); Mon, 2 Feb 2015 23:16:57 -0500 Received: from bh-25.webhostbox.net ([208.91.199.152]:35455 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965925AbbBCEQz (ORCPT ); Mon, 2 Feb 2015 23:16:55 -0500 Date: Mon, 2 Feb 2015 20:15:32 -0800 From: Guenter Roeck To: Junjie Mao Cc: Mauro Carvalho Chehab , Doug Thompson , Borislav Petkov , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] i7core_edac: release resources on error in i7core_create_sysfs_devices Message-ID: <20150203041532.GA27380@roeck-us.net> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) X-Authenticated_sender: guenter@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-CTCH-PVer: 0000001 X-CTCH-Spam: Unknown X-CTCH-VOD: Unknown X-CTCH-Flags: 0 X-CTCH-RefID: str=0001.0A020206.54D04BB7.013E,ss=1,re=0.001,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0 X-CTCH-Score: 0.001 X-CTCH-ScoreCust: 0.000 X-CTCH-Rules: C_4847, X-CTCH-SenderID: linux@roeck-us.net X-CTCH-SenderID-Flags: 0 X-CTCH-SenderID-TotalMessages: 6 X-CTCH-SenderID-TotalSpam: 0 X-CTCH-SenderID-TotalSuspected: 0 X-CTCH-SenderID-TotalConfirmed: 0 X-CTCH-SenderID-TotalBulk: 0 X-CTCH-SenderID-TotalVirus: 0 X-CTCH-SenderID-TotalRecipients: 0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: mailgid no entry from get_relayhosts_entry X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Feb 03, 2015 at 10:40:14AM +0800, Junjie Mao wrote: > v2: do not call kfree on allocated devs after device_initialize is called > > Signed-off-by: Junjie Mao > --- > drivers/edac/i7core_edac.c | 37 +++++++++++++++++++++++++------------ > 1 file changed, 25 insertions(+), 12 deletions(-) > > diff --git a/drivers/edac/i7core_edac.c b/drivers/edac/i7core_edac.c > index 9cd0b301f81b..f6a7b676d69c 100644 > --- a/drivers/edac/i7core_edac.c > +++ b/drivers/edac/i7core_edac.c > @@ -1167,17 +1167,17 @@ static int i7core_create_sysfs_devices(struct mem_ctl_info *mci) > return rc; > rc = device_create_file(&mci->dev, &dev_attr_inject_type); > if (rc < 0) > - return rc; > + goto fail_remove_inject_section; > rc = device_create_file(&mci->dev, &dev_attr_inject_eccmask); > if (rc < 0) > - return rc; > + goto fail_remove_inject_type; > rc = device_create_file(&mci->dev, &dev_attr_inject_enable); > if (rc < 0) > - return rc; > + goto fail_remove_inject_eccmask; > > pvt->addrmatch_dev = kzalloc(sizeof(*pvt->addrmatch_dev), GFP_KERNEL); > if (!pvt->addrmatch_dev) > - return rc; > + goto fail_remove_inject_enable; > > pvt->addrmatch_dev->type = &addrmatch_type; > pvt->addrmatch_dev->bus = mci->dev.bus; > @@ -1190,16 +1190,13 @@ static int i7core_create_sysfs_devices(struct mem_ctl_info *mci) > > rc = device_add(pvt->addrmatch_dev); > if (rc < 0) > - return rc; > + goto fail_free_addrmatch_dev; > > if (!pvt->is_registered) { > pvt->chancounts_dev = kzalloc(sizeof(*pvt->chancounts_dev), > GFP_KERNEL); > - if (!pvt->chancounts_dev) { > - put_device(pvt->addrmatch_dev); > - device_del(pvt->addrmatch_dev); > - return rc; > - } > + if (!pvt->chancounts_dev) > + goto fail_del_addrmatch_dev; > > pvt->chancounts_dev->type = &all_channel_counts_type; > pvt->chancounts_dev->bus = mci->dev.bus; > @@ -1211,10 +1208,26 @@ static int i7core_create_sysfs_devices(struct mem_ctl_info *mci) > edac_dbg(1, "creating %s\n", dev_name(pvt->chancounts_dev)); > > rc = device_add(pvt->chancounts_dev); > - if (rc < 0) > - return rc; > + if (rc < 0) { > + put_device(pvt->chancounts_dev); > + goto fail_del_addrmatch_dev; > + } > } > return 0; > + > +fail_del_addrmatch_dev: > + device_del(pvt->addrmatch_dev); > +fail_free_addrmatch_dev: > + put_device(pvt->addrmatch_dev); > +fail_remove_inject_enable: > + device_create_file(&mci->dev, &dev_attr_inject_enable); > +fail_remove_inject_eccmask: > + device_create_file(&mci->dev, &dev_attr_inject_eccmask); > +fail_remove_inject_type: > + device_create_file(&mci->dev, &dev_attr_inject_type); > +fail_remove_inject_section: > + device_create_file(&mci->dev, &dev_attr_inject_section); I don't know the code, but calling device_create_file() on failures is quite unusual. Are you sure this is correct ? Guenter