From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3407CC32793 for ; Wed, 24 Aug 2022 00:04:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231919AbiHXAEF (ORCPT ); Tue, 23 Aug 2022 20:04:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229872AbiHXAEF (ORCPT ); Tue, 23 Aug 2022 20:04:05 -0400 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69A43895CB for ; Tue, 23 Aug 2022 17:04:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1661299444; x=1692835444; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=FRXqxmC17NmeTrQ+Who5RZtvf5ZbXvugrZGhm695dO0=; b=WsoF5vt1qK3Mj+l7oobMmlLoZtilObLpG642Ie8lWnrRslZAog5Z+zak kAdCryFc/UIDtoLGWrfnwwqQ6tw2aMKwNSoKqvzfYDCfVtbsNDg9+mk8q CFAvvgyxGylJsEhI3hgV7wzso4rY2bHahds7oKK1fi4Keqdo/Tvph4ncA sa3e7x3UQX7TWTVws8a0/JvmzNVi914qmaH2YWcEE4w8cJSfzmuNKHVj4 aTxy+k0l4OK+KeSSdrQsERFyOFfQ7YaY7T8p5EyFMcNq6ng9KYumvBvHW IFnfZj7FQP5UaGSramgMOiViM/vwjRHFTgC/7jEPJy5/IFE0cDNNpxCgd Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10448"; a="274213095" X-IronPort-AV: E=Sophos;i="5.93,259,1654585200"; d="scan'208";a="274213095" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Aug 2022 17:04:02 -0700 X-IronPort-AV: E=Sophos;i="5.93,259,1654585200"; d="scan'208";a="612593069" Received: from djiang5-mobl1.amr.corp.intel.com (HELO [10.212.86.80]) ([10.212.86.80]) by fmsmga007-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Aug 2022 17:04:02 -0700 Message-ID: <3ce09f4d-7e77-24e4-cb66-26ce1d5a4518@intel.com> Date: Tue, 23 Aug 2022 17:04:02 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Firefox/91.0 Thunderbird/91.12.0 Subject: Re: [ndctl PATCH v2 2/3] libcxl: fox a resource leak and a forward NULL check Content-Language: en-US To: Vishal Verma , linux-cxl@vger.kernel.org Cc: nvdimm@lists.linux.dev, Dan Williams References: <20220823074527.404435-1-vishal.l.verma@intel.com> <20220823074527.404435-3-vishal.l.verma@intel.com> From: Dave Jiang In-Reply-To: <20220823074527.404435-3-vishal.l.verma@intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-cxl@vger.kernel.org On 8/23/2022 12:45 AM, Vishal Verma wrote: > Static analysis reports a couple of issues in add_cxl_region(). Firstly, > 'path' wasn't freed in the success case, only in the error case. > Secondly, the error handling after 'calloc()'ing the region object > erroneously jumped to the error path which tried to free the region object. > > Add anew error label to just free 'path' and return for this exit case. > > Cc: Dan Williams > Signed-off-by: Vishal Verma Reviewed-by: Dave Jiang > --- > cxl/lib/libcxl.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/cxl/lib/libcxl.c b/cxl/lib/libcxl.c > index 021d59f..e8c5d44 100644 > --- a/cxl/lib/libcxl.c > +++ b/cxl/lib/libcxl.c > @@ -482,7 +482,7 @@ static void *add_cxl_region(void *parent, int id, const char *cxlregion_base) > > region = calloc(1, sizeof(*region)); > if (!region) > - goto err; > + goto err_path; > > region->id = id; > region->ctx = ctx; > @@ -551,11 +551,13 @@ static void *add_cxl_region(void *parent, int id, const char *cxlregion_base) > > list_add_sorted(&decoder->regions, region, list, region_start_cmp); > > + free(path); > return region; > err: > free(region->dev_path); > free(region->dev_buf); > free(region); > +err_path: > free(path); > return NULL; > }