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; }