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 99AE7C4167B for ; Fri, 10 Nov 2023 18:11:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234611AbjKJSLk (ORCPT ); Fri, 10 Nov 2023 13:11:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344541AbjKJSI6 (ORCPT ); Fri, 10 Nov 2023 13:08:58 -0500 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 604153977C; Fri, 10 Nov 2023 06:44:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699627480; x=1731163480; h=date:from:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=bV43aLPjrxwe5O0bAyLScnB53oCXIL/eFT1glV9PnHc=; b=H209Sdhjs06AB1REfl0pssZ2UPp3SL9pVg5ls5BpsGjWB8AFvyhnkpXU kWocvChtPGnSXYd0Bd8UmxJn1mgErNhyPz90PW+rS38Td26Yubqz5mXbT dGxxv25eBkM/pl0gXObYsZWr9pU8WCUsYIG/HarKgxvQ0PsQSovPu7Pwf z4Vrxl3Pu3qlyB88/EavnCrFHPDpo1wBiNHNyeF3xy8LALk/7xDzwFGaC CezDjv07syF336RxrFQCykXUujKdaNCnkaDKT6a4OI4QLH+l9+RlZhz6v GPVVkwER6qliItz3YvlDIhDeGNDLSif1bLDstUJV99sE1E5DNV2UufGVO Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10890"; a="394096646" X-IronPort-AV: E=Sophos;i="6.03,291,1694761200"; d="scan'208";a="394096646" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2023 06:44:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10890"; a="1010965647" X-IronPort-AV: E=Sophos;i="6.03,291,1694761200"; d="scan'208";a="1010965647" Received: from joudin-mobl2.ger.corp.intel.com ([10.252.38.36]) by fmsmga006-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2023 06:44:36 -0800 Date: Fri, 10 Nov 2023 16:44:33 +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 v2 4/4] platform/x86: hp-bioscfg: Fix error handling in hp_add_other_attributes() In-Reply-To: <20231110142921.3398072-4-harshit.m.mogalapalli@oracle.com> Message-ID: <211e6c1e-9bfa-ac29-b6ba-e198c4f36688@linux.intel.com> References: <20231110142921.3398072-1-harshit.m.mogalapalli@oracle.com> <20231110142921.3398072-4-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 Fri, 10 Nov 2023, Harshit Mogalapalli wrote: This changelog needs to be rewritten, it contains multiple errors. I suppose even this patch could be split into two but I'll not be too picky here if you insist on fixing them in the same patch. > We have two issues: > 1. Memory leak of 'attr_name_kobj' in the error handling path. True, but not specific enough to be useful. > 2. When kobject_init_and_add() fails on every subsequent error path call > kobject_put() to cleanup. This makes no sense. The only case when there old code had no issue is "when kobject_init_and_add() fails" but now your wording claims it to be source of problem. Please rephrase this. > Both of these issues will be fixed when we add kobject_put() in the goto > label, as kfree() is already part of kobject_put(). No, you're fixing a problem in the patch which is not covered by moving kobject_put()! -- i. > 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 > --- > Only compile tested, based on static analysis > v1-> v2: Split this into mutliple patches doing one thing in a patch. > --- > 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 351d782f3e96..8c9f4f3227fc 100644 > --- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c > +++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c > @@ -575,75 +575,77 @@ 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; > 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); > return ret; > } >