From patchwork Mon Nov 13 20:07:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Harshit Mogalapalli X-Patchwork-Id: 164633 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1447291vqg; Mon, 13 Nov 2023 12:08:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IHVpOOw0WoDd+w4bnJ5lage39+lVjJtZnDn3TvKPWpOI0LwB+tn7fRAQNOAKpIcXdJxPezv X-Received: by 2002:a05:6a00:230f:b0:6be:22db:7a13 with SMTP id h15-20020a056a00230f00b006be22db7a13mr7040775pfh.25.1699906089062; Mon, 13 Nov 2023 12:08:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699906089; cv=none; d=google.com; s=arc-20160816; b=cB8xBFj7qKZTqz/EQo4dxLe/19TmTbM80xtL6+pZXeSSK39Xmsdc+KnWAxY7Tz94PX nBkLoPu3wHQQqSHqpUT1GfeffcfsXRQeuxJQMngcAy0xcErYP+GDgphN7slmsU9KwrSQ fv/aR+t/nCegOwnil6WZwlH05lFOynIsgt+jcUhBCDTtdkyYJFKnariE96XbjPO4uBe9 qPG5ijFOXv01jRf5/cdUjV9Bf18yipqRIceMyG2ZWOHdBnn/XZjGxy/p5AnK8tUc3GYC 0x7ozfVO5efEsp4gsBU0GOosiyvoCyIDdIgPFHMHcbBiAdI6APO0qr1z5JRUKPOCcvUB OMTw== 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=fuVCWG9/1pFqM8nRxc0cgkM2TyYa54FsIIfc1Q7gpNs=; fh=Q5UJK/+TFmcTguj5mfgprzb0aHnD1zW+bK3PDJulktc=; b=thTf1P6WYxAx2pwPvCwsqKgbuWdYGftpYd7U0w1LWlGW2CgZaOuJknA9XgMozFDMMg NR8MEwwZrAuumKHXUW2UVsuc2/IaRnlScaCoZG9ttvGkqn8CDzo53rx7QuHMZ6RP3gPV FQFIU/cWXGbxXxevzGPRX/cmIO/BGmG/ew2xH1o8pBEAMCVKFRvo2qKwAqTdJCo4upf9 rLUjaEtL8MIZdXu9mTNU/3cgZ7ffKZr3kLi2PXwEN2KFeLSNQWfre3FZ6Sar1Wnxb4xJ ZJNv0u+fzF155ExvLqw5JWxJ76LXzALjZJoseduNp1RgaS8RQjZgZxO1dOa4ydN3JkYR FlQw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b="S/u7eAb0"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id q3-20020a056a00088300b006b4231ba465si6611261pfj.85.2023.11.13.12.08.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 12:08:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b="S/u7eAb0"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 0B1788028A69; Mon, 13 Nov 2023 12:08:08 -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 S229689AbjKMUIE (ORCPT + 30 others); Mon, 13 Nov 2023 15:08:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229974AbjKMUIC (ORCPT ); Mon, 13 Nov 2023 15:08:02 -0500 Received: from mx0b-00069f02.pphosted.com (mx0b-00069f02.pphosted.com [205.220.177.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A6D110C6; Mon, 13 Nov 2023 12:07:58 -0800 (PST) Received: from pps.filterd (m0246631.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3ADHiA0j000768; Mon, 13 Nov 2023 20:07:50 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=fuVCWG9/1pFqM8nRxc0cgkM2TyYa54FsIIfc1Q7gpNs=; b=S/u7eAb0TlZBhmA22Bt3Ot6q6rOs9nOOYPzsbGab2tIRfMBHHMbiJLBtNLMXkxRwitvn 9lCHy3Afk31fR5Q1P82gxuU2sTKqPTAhLZgDvEXMIVeofb+4NkJPC5EFAmWrF9vdUvTP 2i7Fz5Whd9Bp3kmC9FanLNBDxizT43P1c54552RofDYou1CmNNfYvLe2YY0rYwo6qyu/ zKOIt5pItRWM+anNnoLc8EmQyP4uB1eI05rmongS4JNObq35O2GY3AZPWLVMsXxS5G71 ah3p0e5F4sfqmn3gkcMr/CKwzZvE8HRPmazFdJ6xc97lu54qRDNjybT1xtzHaCx5iR+E PA== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ua2n9upm3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 20:07:49 +0000 Received: from pps.filterd (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (8.17.1.19/8.17.1.19) with ESMTP id 3ADJHqjt029776; Mon, 13 Nov 2023 20:07:49 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3uaxqqe8y0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 20:07:49 +0000 Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3ADK7jMX026381; Mon, 13 Nov 2023 20:07:48 GMT Received: from ca-dev112.us.oracle.com (ca-dev112.us.oracle.com [10.129.136.47]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTP id 3uaxqqe8vg-2; Mon, 13 Nov 2023 20:07:48 +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 Subject: [PATCH v4 2/4] platform/x86: hp-bioscfg: move mutex_lock() down in hp_add_other_attributes() Date: Mon, 13 Nov 2023 12:07:38 -0800 Message-ID: <20231113200742.3593548-2-harshit.m.mogalapalli@oracle.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231113200742.3593548-1-harshit.m.mogalapalli@oracle.com> References: <20231113200742.3593548-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_11,2023-11-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 mlxscore=0 adultscore=0 suspectscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311130159 X-Proofpoint-GUID: YfEi0kz0czkKHnJocIQzo6hjTbfdpH87 X-Proofpoint-ORIG-GUID: YfEi0kz0czkKHnJocIQzo6hjTbfdpH87 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,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 12:08:08 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782480727536172159 X-GMAIL-MSGID: 1782480727536172159 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 --- v3->v4: Add R.B from Ilpo --- 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; }