From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752262AbbBWSOd (ORCPT ); Mon, 23 Feb 2015 13:14:33 -0500 Received: from smtp.infotech.no ([82.134.31.41]:51811 "EHLO smtp.infotech.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751935AbbBWSO3 (ORCPT ); Mon, 23 Feb 2015 13:14:29 -0500 Message-ID: <54EB6DF3.4030909@interlog.com> Date: Mon, 23 Feb 2015 13:14:11 -0500 From: Douglas Gilbert Reply-To: dgilbert@interlog.com User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: SF Markus Elfring , "James E. J. Bottomley" , linux-scsi@vger.kernel.org CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: Re: [PATCH 1/3] SCSI-debug: Deletion of unnecessary checks before the function call "vfree" References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <54D4F7DF.8070008@users.sourceforge.net> <54D4F87F.2050001@users.sourceforge.net> In-Reply-To: <54D4F87F.2050001@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 15-02-06 12:23 PM, SF Markus Elfring wrote: > From: Markus Elfring > Date: Fri, 6 Feb 2015 16:56:57 +0100 > > The vfree() function performs also input parameter validation. > Thus the test around the call is not needed. > > This issue was detected by using the Coccinelle software. > > Signed-off-by: Markus Elfring Acked-by: Douglas Gilbert > --- > drivers/scsi/scsi_debug.c | 12 +++--------- > 1 file changed, 3 insertions(+), 9 deletions(-) > > diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c > index 1132321..9e4add7 100644 > --- a/drivers/scsi/scsi_debug.c > +++ b/drivers/scsi/scsi_debug.c > @@ -4969,12 +4969,9 @@ bus_unreg: > dev_unreg: > root_device_unregister(pseudo_primary); > free_vm: > - if (map_storep) > - vfree(map_storep); > - if (dif_storep) > - vfree(dif_storep); > + vfree(map_storep); > + vfree(dif_storep); > vfree(fake_storep); > - > return ret; > } > > @@ -4989,10 +4986,7 @@ static void __exit scsi_debug_exit(void) > driver_unregister(&sdebug_driverfs_driver); > bus_unregister(&pseudo_lld_bus); > root_device_unregister(pseudo_primary); > - > - if (dif_storep) > - vfree(dif_storep); > - > + vfree(dif_storep); > vfree(fake_storep); > } > >