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 1284BC4167D for ; Mon, 13 Nov 2023 19:08:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231618AbjKMTIk (ORCPT ); Mon, 13 Nov 2023 14:08:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229454AbjKMTIi (ORCPT ); Mon, 13 Nov 2023 14:08:38 -0500 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.10]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99FB210DA; Mon, 13 Nov 2023 11:08:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699902516; x=1731438516; h=date:from:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=RWuZGymKIqhMoPAMiW5sUvw7QyKkVuXDwfP2eBdjPos=; b=ejgRuKnpkL44l+AEl9T5QhcogkvbcKHp1z7oaUHbknpq0fsgrpEMB68H ZrYvBJyElyTvGeZzc44J8zsW9QXv0a02I43+7tDDU15n+39dInhb6cOH0 5EyPEO9wzMRfK3KHd/8Ox1lzARFb3B25yYMtXLda+ORRiZsiL0j1Hm7+C w+C3P5bYUioluX/lWYRkPrVTZp97IUQ0c/p+o9snYnXd+VaU+zBGB5sGE DU/UxqVXUlksASGORQlTn3Swjm8Z4kOLXi8nMxtqdsZvTSSKnrn9LXYH5 xiQ32UwiKfaWjN8g5VR+KqCaos9R0n04WJQRqtEhavf2KvFFYYnKXMAt3 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="3577973" X-IronPort-AV: E=Sophos;i="6.03,299,1694761200"; d="scan'208";a="3577973" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orvoesa102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Nov 2023 11:08:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10893"; a="714299388" X-IronPort-AV: E=Sophos;i="6.03,299,1694761200"; d="scan'208";a="714299388" Received: from alexdsou-mobl3.gar.corp.intel.com ([10.249.44.83]) by orsmga003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Nov 2023 11:08:31 -0800 Date: Mon, 13 Nov 2023 21:08:24 +0200 (EET) From: =?ISO-8859-15?Q?Ilpo_J=E4rvinen?= To: Harshit Mogalapalli cc: Jorge Lopez , Hans de Goede , Mark Gross , =?ISO-8859-15?Q?Thomas_Wei=DFschuh?= , platform-driver-x86@vger.kernel.org, LKML , dan.carpenter@linaro.org, kernel-janitors@vger.kernel.org, error27@gmail.com, vegard.nossum@oracle.com, darren.kenny@oracle.com, kernel test robot Subject: Re: [PATCH v3 3/4] platform/x86: hp-bioscfg: Fix error handling in hp_add_other_attributes() In-Reply-To: <20231113185852.3579970-3-harshit.m.mogalapalli@oracle.com> Message-ID: References: <20231113185852.3579970-1-harshit.m.mogalapalli@oracle.com> <20231113185852.3579970-3-harshit.m.mogalapalli@oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 13 Nov 2023, Harshit Mogalapalli wrote: > 'attr_name_kobj' is allocated using kzalloc, but on all the error paths we > don't free it, hence we have a memory leak. Fix it by adding kfree(). Don't use "we". This is still somewhat confusing... I think it would be better with these two amendments. Fix the error path before kobject_init_and_add() by adding kfree(). > kobject_put() must be always called after passing the object to > kobject_init_and_add(). Only the error path which is immediately next > to kobject_init_and_add() calls kobject_put() and not any other error > path after it. > > Fix the error handling by moving the kobject_put() into the goto label Fix the error handling after kobject_init_and_add() by moving ... > err_other_attr_init that is already used by all the error paths after > kobject_init_and_add(). > > Fixes: a34fc329b189 ("platform/x86: hp-bioscfg: bioscfg") > Reported-by: kernel test robot > Reported-by: Dan Carpenter > Closes: https://lore.kernel.org/r/202309201412.on0VXJGo-lkp@intel.com/ > Signed-off-by: Harshit Mogalapalli > --- > This is based on static analysis, only compile tested. > > v2->v3: Improve commit message as suggested by Iplo on v2. > https://lore.kernel.org/all/1b58df2d-b444-ddb7-7533-9911d35f8f7@linux.intel.com/ > --- > drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c > index a3599498c4e8..6ddca857cc4d 100644 > --- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c > +++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c > @@ -575,77 +575,79 @@ static void release_attributes_data(void) > /** > * hp_add_other_attributes() - Initialize HP custom attributes not > * reported by BIOS and required to support Secure Platform and Sure > * Start. > * > * @attr_type: Custom HP attribute not reported by BIOS > * > * Initialize all 2 types of attributes: Platform and Sure Start > * object. Populates each attribute types respective properties > * under sysfs files. > * > * Returns zero(0) if successful. Otherwise, a negative value. > */ > static int hp_add_other_attributes(int attr_type) > { > struct kobject *attr_name_kobj; > union acpi_object *obj = NULL; > int ret; > char *attr_name; > > attr_name_kobj = kzalloc(sizeof(*attr_name_kobj), GFP_KERNEL); > if (!attr_name_kobj) > return -ENOMEM; > > mutex_lock(&bioscfg_drv.mutex); > > /* Check if attribute type is supported */ > switch (attr_type) { > case HPWMI_SECURE_PLATFORM_TYPE: > attr_name_kobj->kset = bioscfg_drv.authentication_dir_kset; > attr_name = SPM_STR; > break; > > case HPWMI_SURE_START_TYPE: > attr_name_kobj->kset = bioscfg_drv.main_dir_kset; > attr_name = SURE_START_STR; > break; > > default: > pr_err("Error: Unknown attr_type: %d\n", attr_type); > ret = -EINVAL; > - goto err_other_attr_init; > + kfree(attr_name_kobj); > + goto unlock_drv_mutex; > } > > ret = kobject_init_and_add(attr_name_kobj, &attr_name_ktype, > NULL, "%s", attr_name); > if (ret) { > pr_err("Error encountered [%d]\n", ret); > - kobject_put(attr_name_kobj); > goto err_other_attr_init; > } > > /* Populate attribute data */ > switch (attr_type) { > case HPWMI_SECURE_PLATFORM_TYPE: > ret = hp_populate_secure_platform_data(attr_name_kobj); > break; > > case HPWMI_SURE_START_TYPE: > ret = hp_populate_sure_start_data(attr_name_kobj); > break; > > default: > ret = -EINVAL; > } > > if (ret) > goto err_other_attr_init; > > mutex_unlock(&bioscfg_drv.mutex); > return 0; > > err_other_attr_init: > + kobject_put(attr_name_kobj); > +unlock_drv_mutex: > mutex_unlock(&bioscfg_drv.mutex); > kfree(obj); > return ret; > } >