From patchwork Mon Nov 13 18:58:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Harshit Mogalapalli X-Patchwork-Id: 164598 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1410300vqg; Mon, 13 Nov 2023 10:59:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IG/Oywvg06dGcF5BxHI5lOfV8s3cyTSJVqhG+hxdP0ndSVqtB/8XReQE96S8rpZkRGt1ut6 X-Received: by 2002:a05:6a00:2e21:b0:68e:46d2:e331 with SMTP id fc33-20020a056a002e2100b0068e46d2e331mr6781715pfb.23.1699901959997; Mon, 13 Nov 2023 10:59:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699901959; cv=none; d=google.com; s=arc-20160816; b=ncuBE2es5bAR/a/oV6r8MZVx4CLwwyG7QmTvUY4LtqU1LvOSRkSzWZEqQSwMYkSDec 0uTdmVNNozfJ0/9ulrjHTsMql4lunu6hprRsv2OforUHAQ3p6kDbD3g+cuvRvnHOOJxz 13SncPm08+4ehu4wEEdtB/8vR1QB8DpYQ/bnMPOjuqJIFMpvy1PPlkF/KUaSZiFx8LJI gtfZd1p8o0OHYL0JCwF8FY3MI18iKnJ6ewvuR67Bl2qB5WtQN2r9D56D2O3N8FrIqIdY FqS0REeZJH4YAp0/uPRK8sn2eopY9FAPqfeESSyI1nAtjbU4xOLz18Amixh3mTnClLw4 SOpQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=rms0EBJlQA/WbF9f5fMcthPrbCoO3mTvOoWCy/BgO0I=; fh=YRxemmcaHY6sEJjOQnh/QgYDMEtZ6d1JiMzHL5HIkZw=; b=Jc8jZpSFmUpmkiNIkcK9/N211USJtazXfMKmxkOPJP616ctz05r/BcibU9GXRdK+xP 2CGOEf8jua3AJRJkeOTGxvCxRZOjRmHrfBg1znuKif1gWAOy2tAS4uPQzva/AMMwicXH YEh+2WADDPPL8GSyn5XjTYJSQF5pjAtfpX0z/7ayDcF1W+pYK5uEdJM9hOttHH25ZpIl gWTS2HCrF8Bj1Y+6/hnGah+XMpMO1asQncKGQituKxf8EBAUaxJCJCf2sY2BQVQM7t0C 2WFSEe2z3poaxHFtlCiZisoZDXo1MnDFB6ehONIS3nYzcWf89d0+yWnQDJfwnyR7CW68 xpXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=TYxrabgK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id l125-20020a633e83000000b0058986c07537si6687276pga.220.2023.11.13.10.59.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 10:59:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=TYxrabgK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 37B628077999; Mon, 13 Nov 2023 10:59:18 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231635AbjKMS7N (ORCPT + 30 others); Mon, 13 Nov 2023 13:59:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230086AbjKMS7L (ORCPT ); Mon, 13 Nov 2023 13:59:11 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2BD90F5; Mon, 13 Nov 2023 10:59:08 -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 3ADHiQiC005408; Mon, 13 Nov 2023 18:58:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=corp-2023-03-30; bh=rms0EBJlQA/WbF9f5fMcthPrbCoO3mTvOoWCy/BgO0I=; b=TYxrabgK6Y/h1mMRKDPfQSehMhjVL00vArKAMAc5GJLXthTzHt9REI9R46y+dEFlrY8R EYPB43JkD5WFObYn+8BWsqliYjrmj3TCaUUCZhez88fwfGlb5YCZd5UQmM7NJ7KksKVm kqwgJy5mFTrjgqNUbar64yOUYDirBor0Nuco3zwfKc/BsAyIe8AsluwOyB1DVU4NTs63 aaCYKz3EOfnuzZqh2/BP95pQQBS/jTzDiM3mt04s1FVVCbNxN4w8K1GbXl26JO5n5Aqu QD6tA8jfqrappM8pkZxZi9+BuvDVxVrnDtFkOm9nEVe86cJwTgQudjnTkXUO53ZHv6WT jQ== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ua2n3bgcv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 18:58:56 +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 3ADHiZRe015109; Mon, 13 Nov 2023 18:58:56 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3uaxpuuqwg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 18:58:56 +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 3ADIwtmN021868; Mon, 13 Nov 2023 18:58:55 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-1; Mon, 13 Nov 2023 18:58:55 +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 Subject: [PATCH v3 1/4] platform/x86: hp-bioscfg: Simplify return check in hp_add_other_attributes() Date: Mon, 13 Nov 2023 10:58:47 -0800 Message-ID: <20231113185852.3579970-1-harshit.m.mogalapalli@oracle.com> X-Mailer: git-send-email 2.42.0 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: wYpONw9UBO1mjcN28XGgHDMXMLIYaeau X-Proofpoint-ORIG-GUID: wYpONw9UBO1mjcN28XGgHDMXMLIYaeau X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Mon, 13 Nov 2023 10:59:18 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782476397472864557 X-GMAIL-MSGID: 1782476397472864557 All cases in switch-case have a same goto on error, move the return check out of the switch. This is a cleanup. Signed-off-by: Harshit Mogalapalli Reviewed-by: Ilpo Järvinen --- drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c index 5798b49ddaba..10676e1abc28 100644 --- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c +++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c @@ -575,81 +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; mutex_lock(&bioscfg_drv.mutex); attr_name_kobj = kzalloc(sizeof(*attr_name_kobj), GFP_KERNEL); if (!attr_name_kobj) { ret = -ENOMEM; goto err_other_attr_init; } /* 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; } 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); - if (ret) - goto err_other_attr_init; break; case HPWMI_SURE_START_TYPE: ret = hp_populate_sure_start_data(attr_name_kobj); - if (ret) - goto err_other_attr_init; break; default: ret = -EINVAL; - goto err_other_attr_init; } + if (ret) + goto err_other_attr_init; + mutex_unlock(&bioscfg_drv.mutex); return 0; err_other_attr_init: mutex_unlock(&bioscfg_drv.mutex); kfree(obj); return ret; } From patchwork Mon Nov 13 18:58:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Harshit Mogalapalli X-Patchwork-Id: 164599 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1410493vqg; Mon, 13 Nov 2023 10:59:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IFzi5SwzwKIyqlkidv7iA9WzB/+GZ/EwTaflyeeqf5oiY/APsvAJqCpyCVk8Xvt/C15YSpO X-Received: by 2002:a05:6a20:4404:b0:181:10ee:20c6 with SMTP id ce4-20020a056a20440400b0018110ee20c6mr6702906pzb.42.1699901979764; Mon, 13 Nov 2023 10:59:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699901979; cv=none; d=google.com; s=arc-20160816; b=KI0L9bacGbQ/U2NTdSAI7qGi/sLsJGjpRJYS9VNXPk2xkOEiamCFHHOHRjB69Q7JjD rG2jOkd0NarnZloi/SgLpe0TNz07Mm+bk1/0SWYeCQjCu5SExu0M7RsJB/bQTpmVKRJH FcEt/eMO87m1PkdfSE9osJsmtjAcFTNhlCL3NnmqVUViCbaapYcMTR+/h+bA0/G6Io1Y PrqNwU6ZN9hqmXgN4/JzuSqYhyESjMFjBnkOgrcHID7O2+BqqdGeua9THLBX15qwkrTj 89kMOnmmSxDYpyP/gATNGayHOwap3leoLf4uOt9c43EVs2O0yEJcjqN9WdtvXml2jT6a vrHg== 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=zzMNjX3BrfWHKIRbDY1jN8f3ILT5tuXU2IMqzvh17gw=; fh=YRxemmcaHY6sEJjOQnh/QgYDMEtZ6d1JiMzHL5HIkZw=; b=FE0b+txFFYM9DUH4JbO0zpQqaYyw0me0VP+nDoi5BT3+XS5CfyLLOao3OO3E7pRQ39 F36oy0QSv/jegYaWeLcVZzOGbOyzWXOODKp6WSk/78dE+19xm2vxj5X3Ro6m5v/+B2le fDEQam6xXZJNj24Gj4HfClCtQAQOsOvshna1qBU2dQjabPV+PaJsCw9MUeux/8cLmyv0 vcu3I/k/w5bL2vXHxYG7AfEblfekt83lUeE20SlbEYIBVJ7su67kU8TT/fQCZcc+0Mdr zwBSv5ZduQC/7ywNr+hqOAcKisuhXtKKLhD0j892/X9jTkN/o1sgKWmAQw7U5M7MmKej MkcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=nJ4FH4NK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id cw27-20020a056a00451b00b006bd3ba8e610si6572280pfb.133.2023.11.13.10.59.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 10:59:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=nJ4FH4NK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id D0B0D80AC59A; Mon, 13 Nov 2023 10:59:35 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231543AbjKMS7M (ORCPT + 30 others); Mon, 13 Nov 2023 13:59:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230041AbjKMS7L (ORCPT ); Mon, 13 Nov 2023 13:59:11 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CDA2FF3; Mon, 13 Nov 2023 10:59:07 -0800 (PST) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3ADHipp6019571; Mon, 13 Nov 2023 18:58:58 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-type : content-transfer-encoding; s=corp-2023-03-30; bh=zzMNjX3BrfWHKIRbDY1jN8f3ILT5tuXU2IMqzvh17gw=; b=nJ4FH4NKn26x7AakDb3+gXSyACChaO8bzk5CsAmX+TAtKY8MfaB/guJ+xKc+zuksIWE/ r8A+AFvWZYUxemCPc3sI8JjcSmOwsjA4px1O5eoKNG7PB5DQw8Uql77vzwFG6Wg6A1WD 5n2t8DRVKZTGjdKSK16DC5j59x48hLl5f8QtMRKuhEc90RIp2UUCavN6MBFezhEgFRUP mzgWqXRnuEAfuZNIiie97tgNtEz/p4m4Xs+NnAtnagOUU0pMbWIQIwHl9gbFyqrCxark CexBPcIq+Dq9KjEweMTZ5xZjLe4rdmNKoR65lFHWxdCjiUKGTgax6C1/+E9MrN5N+TNj 7A== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ua2m2bh23-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 18:58:58 +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 3ADIVaiH014944; Mon, 13 Nov 2023 18:58:57 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3uaxpuuqxk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 18:58:57 +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 3ADIwtmP021868; Mon, 13 Nov 2023 18:58:57 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-2; Mon, 13 Nov 2023 18:58:57 +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 Subject: [PATCH v3 2/4] platform/x86: hp-bioscfg: move mutex_lock() down in hp_add_other_attributes() Date: Mon, 13 Nov 2023 10:58:48 -0800 Message-ID: <20231113185852.3579970-2-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: ZcJ0bag_RAv6qD8zUnSAz9_Lbi0RDcMG X-Proofpoint-ORIG-GUID: ZcJ0bag_RAv6qD8zUnSAz9_Lbi0RDcMG 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 agentk.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 (agentk.vger.email [0.0.0.0]); Mon, 13 Nov 2023 10:59:35 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782476418694464622 X-GMAIL-MSGID: 1782476418694464622 attr_name_kobj's memory allocation is done with mutex_lock() held, this is not needed. Move allocation outside of mutex_lock() so unlock is not needed when allocation fails. Suggested-by: Ilpo Järvinen Signed-off-by: Harshit Mogalapalli Reviewed-by: Ilpo Järvinen --- drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c index 10676e1abc28..a3599498c4e8 100644 --- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c +++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c @@ -575,79 +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; union acpi_object *obj = NULL; int ret; char *attr_name; - mutex_lock(&bioscfg_drv.mutex); - attr_name_kobj = kzalloc(sizeof(*attr_name_kobj), GFP_KERNEL); - if (!attr_name_kobj) { - ret = -ENOMEM; - goto err_other_attr_init; - } + 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; } 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: mutex_unlock(&bioscfg_drv.mutex); kfree(obj); return ret; } 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; } From patchwork Mon Nov 13 18:58:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Harshit Mogalapalli X-Patchwork-Id: 164601 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1410630vqg; Mon, 13 Nov 2023 10:59:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IE/3T3j5K/wNqTdGJ1a8tIsa/F+8Lxj/lBrNHgY6491yRFeZIqQ3JzeZpqG8aFc5s8nmEaE X-Received: by 2002:a17:903:1246:b0:1c5:efd1:82b6 with SMTP id u6-20020a170903124600b001c5efd182b6mr143869plh.30.1699901998474; Mon, 13 Nov 2023 10:59:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699901998; cv=none; d=google.com; s=arc-20160816; b=mekXom0EeuRBx0muivmFhdqtknUpG0cRWY/OQ0mxCUud8p7bzIoxv/+wG6t9b9KEIm w2hDbVvfZ5pVFpv1amO28qUk5N3xeVhLGJFE/kr4FwsXySzkFHJOkCGieCsQmLZI9oDp 0MtP2jlyW4yp1tZaPbE03NkN6fRFQOp4iUq3HhoC6XmnM4ti/VAGZDruiV3YxWLOQTiR BmebhvBezuFkQM9kRcf9mgRxJPOzgDr5DtRqfK1EI+CgraMZFyPFHaODXhXx4n7KXwAT eiJlSkRJUy/myGH++Fx3Lz+0CoC7I9w5B8HVmYZj+LVA71bIKqHo0Isg8cA3t88/JEXr G4qA== 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=cADs8qk2ppLthQt4oT8j8ZmUSa4B8v92ZlV1vefrQM4=; fh=YRxemmcaHY6sEJjOQnh/QgYDMEtZ6d1JiMzHL5HIkZw=; b=1EDuuES+iza5l1evrYJdMNhdXZWsz3V+mzwRNAz4V7pYXGBkjf/XyT3XVaalSPRnLn 1fHWuGXTE42+NRqDbO3oIJYNPArjyP2GVqvrieFduyupXAWAb+JO0IwjVLRuEymy0I5/ miXS3/c07Yp2EI/yv13oA29RQlcAJ2H3fyz33my7R17gmcOXad3ii2hhHCZAEhCZE1yb lNW/k4haAAVAzlmJAeSBH+WhzUpvNV8jizJGiyMREFX+jV9F2gVObx65EaKtDGGOOi2g b5T4mMbXsx9VDUtALs5ctNxqvzosWzaLsus5EIoqr7ZgC7MvPjsN57Sn+pPsbyiPYeUO vdAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=0eq9BDRy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id t20-20020a1709028c9400b001b8c6890612si5944061plo.594.2023.11.13.10.59.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 10:59:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=0eq9BDRy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 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 fry.vger.email (Postfix) with ESMTP id A2C5E804C525; Mon, 13 Nov 2023 10:59:46 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231770AbjKMS7S (ORCPT + 30 others); Mon, 13 Nov 2023 13:59:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231618AbjKMS7N (ORCPT ); Mon, 13 Nov 2023 13:59:13 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8885D10EC; Mon, 13 Nov 2023 10:59:10 -0800 (PST) Received: from pps.filterd (m0246627.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3ADHiqMw019587; Mon, 13 Nov 2023 18:59:03 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-type : content-transfer-encoding; s=corp-2023-03-30; bh=cADs8qk2ppLthQt4oT8j8ZmUSa4B8v92ZlV1vefrQM4=; b=0eq9BDRyOuLbABYO8n9OkHk7WQTHyCLAyOcMxk6vHbGaCp2oR6NrsBwx4yCtsoRfsTzo hntauscF8FTL1pFdUzjnte/s7aWRB6LS34sKtvsyG2Mk/haG8Jq+0UXj3PGufiJQhEHH xoMRyMTMBkWnQi8wD1hx2S7DmAMFF0bXwq/TWVkpNujhDWiPCKNRDHz5169BPuV9yjVJ IzD5xIv26MCjtLNt4OhEH4rimQn81ZPDTAL1rKvkRN0B5+Uh03z/nIvsd099NM63UXRe gGl43EoAuwS97R9MubKmXEPgmUYtQnhOxlAW/TbovBWEZbkg1Ft4Pz+YE6PGzvfPk/TV dA== Received: from phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (phxpaimrmta02.appoci.oracle.com [147.154.114.232]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ua2m2bh29-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 18:59:02 +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 3ADItAf1014991; Mon, 13 Nov 2023 18:59:02 GMT Received: from pps.reinject (localhost [127.0.0.1]) by phxpaimrmta02.imrmtpd1.prodappphxaev1.oraclevcn.com (PPS) with ESMTPS id 3uaxpuur09-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 18:59:02 +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 3ADIwtmT021868; Mon, 13 Nov 2023 18:59:01 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-4; Mon, 13 Nov 2023 18:59:01 +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 Subject: [PATCH v3 4/4] platform/x86: hp-bioscfg: Remove unused obj in hp_add_other_attributes() Date: Mon, 13 Nov 2023 10:58:50 -0800 Message-ID: <20231113185852.3579970-4-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: 7OWOZMsGqalXqO1_hyXQl7fJnb2xcVHP X-Proofpoint-ORIG-GUID: 7OWOZMsGqalXqO1_hyXQl7fJnb2xcVHP 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 fry.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 (fry.vger.email [0.0.0.0]); Mon, 13 Nov 2023 10:59:47 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782476437750346574 X-GMAIL-MSGID: 1782476437750346574 acpi_object *obj is unused in this function, so delete it, also delete a unnecessary kfree(obj); Signed-off-by: Harshit Mogalapalli Reviewed-by: Ilpo Järvinen --- v2->v3: Add R.B from Ilpo and move this patch to end of the series. --- drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c index 6ddca857cc4d..8c9f4f3227fc 100644 --- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c +++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c @@ -575,80 +575,78 @@ 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; 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); 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; }