From patchwork Fri Nov 10 14:29:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Harshit Mogalapalli X-Patchwork-Id: 163948 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp1336290vqs; Fri, 10 Nov 2023 11:29:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IFim7mH1Y3VvSz1cxakuS+5jsAdVIRXHTo7vnLO8nLoGFUAnRPz9AbCfky+aKlvrML+qbcD X-Received: by 2002:a05:6e02:1907:b0:359:4199:1fee with SMTP id w7-20020a056e02190700b0035941991feemr482424ilu.12.1699644581091; Fri, 10 Nov 2023 11:29:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699644581; cv=none; d=google.com; s=arc-20160816; b=TIaFRUzL2KbL0v96XjO/hZzw2assE5syrzgnUlg99+qqOsepfEZK0FCLm+VgoqbO0b AjHRWqKxh8pjbVCfJygdrbzad7/1esQZamCNPeL3MPncpTB0z6m9FmBsnbm5TUj9Jvfx LfjN75Ej5IxVMn6c1b9Mm6HrJ0M5pE/LuYplQlPHxQMu4jylPCvWaocquzMR/9zzZx1O 6PStZdrWLd3Zq9hs2cdzUlAwxz44JGi0ycPGubk7D4dM8D68F2ZgN0F92GdVNyKJoCqz V4hq9wGujvtcWKiDYlsl0B/BmAYvO++BFrnFCktz4ZVhcOoS9XOKARTKSkg8aAyFCHEy nNYg== 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=49XN1GLQjreRWjL6oCqCzu/eSUD1SvMvLMvnNGAx4Rg=; fh=YRxemmcaHY6sEJjOQnh/QgYDMEtZ6d1JiMzHL5HIkZw=; b=gE52Z1gtMIifs1tR+WhZwAii/9IpyAD3EA3xf0+Bw6gB593Z4AYcIMGGG6p/R7op99 sGU1dCk4JyRot+uV/vGlH+nJ9TxShg49J4Ma3JmKwbMUfgtoBNqpaqVPzEF1zHmbJ96S xgaOxTBYUr8WP3/ohr+I0Zbd3Khf2eB12MjoBNR510FneVh4skIoSRLjWsGHfAbtvOzE aVMtDnfYxvX3ygVZQTNHA7XaTnTmkp2TsSK7qHFzcrV4aY8na4hKSDpBWCn18nSSTP2g 13r7KZIIo2iIVnZJrprO8jQ5vBSd9WxIvVhdmzUJaR2+VGTseKhc01VHQ+W8j43tkm0f 7AMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=FxwDtfT8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id 79-20020a630252000000b005b57aa8517bsi79121pgc.91.2023.11.10.11.29.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Nov 2023 11:29:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=FxwDtfT8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 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 lipwig.vger.email (Postfix) with ESMTP id 510CE82E4D8C; Fri, 10 Nov 2023 11:29:29 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346266AbjKJT3C (ORCPT + 29 others); Fri, 10 Nov 2023 14:29:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41294 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345961AbjKJT2d (ORCPT ); Fri, 10 Nov 2023 14:28:33 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8F1F38EB5; Fri, 10 Nov 2023 06:29:53 -0800 (PST) Received: from pps.filterd (m0333521.ppops.net [127.0.0.1]) by mx0b-00069f02.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3AACHZqe023416; Fri, 10 Nov 2023 14:29:43 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=49XN1GLQjreRWjL6oCqCzu/eSUD1SvMvLMvnNGAx4Rg=; b=FxwDtfT88hTjkCcq3zGo1aOs5NQlpB/htknsNhF2UP8jItm+LPdGSWbs9JgJV1jz6xiT e6kM+KH9zE3uDNLQ5HN8O02ZFMSuwrsH4nIbBz9YGaVm3yPtB0j6GgPKvd+bv0LN4Qyx vZBonNdFhUCAaYT8GYPX8+bbERmss3hB+2rXCh2eEQ7dasJhUISdC4UhKLGqNc0jd/VM bRqTBzHOxDD75lTvKJESDMhM3TMLBOO4Y+k5dqxIa2u/4ub4PIxFmgeL2HLWoY/+aHdi oDOdzOvGyYiRurZfEQsqfBAXlTcHrczWp+rQe4HxglOZmD3+D6T4mo57OxaD2uXObwqX cA== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3u7w23pc08-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 10 Nov 2023 14:29:42 +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 3AACpZBP024974; Fri, 10 Nov 2023 14:29:41 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3u9fr6y1gd-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 10 Nov 2023 14:29:41 +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 3AAEQwWN000777; Fri, 10 Nov 2023 14:29:40 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 3u9fr6y1bq-3; Fri, 10 Nov 2023 14:29:40 +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 v2 3/4] platform/x86: hp-bioscfg: move mutex_lock down in hp_add_other_attributes() Date: Fri, 10 Nov 2023 06:29:18 -0800 Message-ID: <20231110142921.3398072-3-harshit.m.mogalapalli@oracle.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231110142921.3398072-1-harshit.m.mogalapalli@oracle.com> References: <20231110142921.3398072-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-10_11,2023-11-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 bulkscore=0 malwarescore=0 phishscore=0 mlxlogscore=999 adultscore=0 mlxscore=0 spamscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311100120 X-Proofpoint-GUID: M3W31vooj76aZZdZy5EmvBhHoErN1uRh X-Proofpoint-ORIG-GUID: M3W31vooj76aZZdZy5EmvBhHoErN1uRh 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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Fri, 10 Nov 2023 11:29:29 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782200973873778957 X-GMAIL-MSGID: 1782206516036998578 attr_name_kobj's memory allocation is done with mutex_lock held, this probably is not needed. Move the mutex_lock downward so we need not unlock when allocation fails. Suggested-by: Ilpo Järvinen Signed-off-by: Harshit Mogalapalli --- 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 3b735b071a01..351d782f3e96 100644 --- a/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c +++ b/drivers/platform/x86/hp/hp-bioscfg/bioscfg.c @@ -575,77 +575,75 @@ 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; - 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); return ret; }