From patchwork Mon Nov 13 18:58:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harshit Mogalapalli X-Patchwork-Id: 164600 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1410618vqg; Mon, 13 Nov 2023 10:59:57 -0800 (PST) X-Google-Smtp-Source: AGHT+IHBASq6o2rMHH2SgWHQT7ZEEsDWgb+rzFHf8AleGD93rXyr7Q5VnugMfu6o6klkCxEnNvE5 X-Received: by 2002:a05:6a20:42a5:b0:181:a784:67df with SMTP id o37-20020a056a2042a500b00181a78467dfmr512591pzj.20.1699901997614; Mon, 13 Nov 2023 10:59:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699901997; cv=none; d=google.com; s=arc-20160816; b=kod89xk1mP5YDJ11v4OmZB5bY3FUS94ktol1Ug+ox3rKrsWsT2vTYqd0HdvE3U7We2 iMP9OQ5uKCvLFFdKeXIim8O6PHf7+8xAs9riW9IewF4hG0UUt3UOFaRCq0Jc9RypJfTI S53EVNcVpacYodAi3FkS5UbXzqqHrUcw1AoYDKMlA0+hiB2Ac8D/DpLAALjEbsDaQOnT xY+MZEkqMkluOQ5qA43WQD/V9Zl3FtlAFfFBALxnvogok7cHxBCv6vCf3vH/ZtdkL8V9 Ps23dglo9GQM5Hxxhu0U4cGJwz8HMENk0rBodd3486KCX4lcGPVQcwXdFfNK2tz8zn75 OYHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=m2Z68kkgUoaQ5NDHnfClpNqPdB3xzduUULcAJAQiy6o=; fh=hvXYu+39xkzzPxwpNcH/2ax0hAzfL6QZ8c2IOzQ9n/s=; b=JfBWQj9TrQ+Ogn7DCbqJCbXYoUmf6J3Mn0S0BkfV+J5zRo5wDUd8rFehCy5/VgRza4 TM4ATzE1N0gUkvoHPYg9P6UOoqf+CMsqXrNgDBruLdmpUuIco0QLK8GqN25RQsINEMqZ 2xHTkNEsK1uPq45fQXawL1da0Cg4z9faH6rMgYIrw/UdLX24qZ0UnyyWJ3ge1NKgiXxf Tq9ZyqE+XDQaQiYlSMVr05CeT7hUrBZ+NPw8/vWyBtt1iAOz0kzkC/Na9iC5HJnHIjkZ H2b+DB6M15oFVJJvCApsVb6HyHMUtHXbIkUjD/x7d0Wo/3/ClfyTXPovVtrZrNdh/eTM XZaQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=fzgdLlh4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id q8-20020a6557c8000000b005bdd76219edsi5921139pgr.675.2023.11.13.10.59.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 10:59:57 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=fzgdLlh4; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=oracle.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id A78FA80A221B; Mon, 13 Nov 2023 10:59:46 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231706AbjKMS7Q (ORCPT + 30 others); Mon, 13 Nov 2023 13:59:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46910 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230041AbjKMS7M (ORCPT ); Mon, 13 Nov 2023 13:59:12 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD10110DA; Mon, 13 Nov 2023 10:59:09 -0800 (PST) Received: from pps.filterd (m0246629.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3ADHiQ3v005416; Mon, 13 Nov 2023 18:59:01 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding; s=corp-2023-03-30; bh=m2Z68kkgUoaQ5NDHnfClpNqPdB3xzduUULcAJAQiy6o=; b=fzgdLlh4eSRrrcql0j3pH6KIabRea91N4ILc2i0po9Ix6vzNGYv04wzVcXc6YBs51r5Y kvjUqgZOg572LNf9ZYyi+5YgblgLKdvdvnveDFLEU3arZNrXRrSVl38H0YNr7Uv4VpX6 hd6v7Hl7Sbw4L07q08BpyYIgluZbMgr5gudRNHwBJe8ESZI2VlhqgGr3BzVQo0StFHnx Yt5KUwTDFyDd+e9N1neeGt9XLbFgT8F01E/VUTO2awhLibuS+LTMwMX3caphrc3xRddc vSYy65yU+nAl/M0vk6Fr9AbLwZsxMzHDwK0BLJ7EZE8MCGyZaBocbwrl+xOEijZedaok iw== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ua2n3bgd1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 18:59:00 +0000 Received: from pps.filterd (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 3ADHnvfG015071; Mon, 13 Nov 2023 18:59:00 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3uaxpuuqyg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 18:58:59 +0000 Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3ADIwtmR021868; Mon, 13 Nov 2023 18:58:59 GMT Received: from ca-dev112.us.oracle.com (ca-dev112.us.oracle.com [10.129.136.47]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTP id 3uaxpuuqw1-3; Mon, 13 Nov 2023 18:58:59 +0000 From: Harshit Mogalapalli To: Jorge Lopez , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= , Mark Gross , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , platform-driver-x86@vger.kernel.org, linux-kernel@vger.kernel.org Cc: dan.carpenter@linaro.org, kernel-janitors@vger.kernel.org, error27@gmail.com, vegard.nossum@oracle.com, harshit.m.mogalapalli@oracle.com, darren.kenny@oracle.com, kernel test robot Subject: [PATCH v3 3/4] platform/x86: hp-bioscfg: Fix error handling in hp_add_other_attributes() Date: Mon, 13 Nov 2023 10:58:49 -0800 Message-ID: <20231113185852.3579970-3-harshit.m.mogalapalli@oracle.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231113185852.3579970-1-harshit.m.mogalapalli@oracle.com> References: <20231113185852.3579970-1-harshit.m.mogalapalli@oracle.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-13_09,2023-11-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 adultscore=0 phishscore=0 mlxscore=0 bulkscore=0 spamscore=0 suspectscore=0 mlxlogscore=999 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311130153 X-Proofpoint-GUID: mNrRz8r_FdSkydbw5hiAjrU5q49iIHXn X-Proofpoint-ORIG-GUID: mNrRz8r_FdSkydbw5hiAjrU5q49iIHXn X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 13 Nov 2023 10:59:47 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782476437107707160 X-GMAIL-MSGID: 1782476437107707160 '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(). 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 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; }