From patchwork Mon Nov 13 20:07:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Harshit Mogalapalli X-Patchwork-Id: 164635 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1447579vqg; Mon, 13 Nov 2023 12:08:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IGsM2oFKaxMInCpU882DMSlJo8Qr6xl2E1J/PdeiPUDS6Vopo7CgV2MYIO5fWnWGadM5T0Y X-Received: by 2002:a05:6830:1251:b0:6d6:47c9:36a4 with SMTP id s17-20020a056830125100b006d647c936a4mr191687otp.16.1699906120546; Mon, 13 Nov 2023 12:08:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699906120; cv=none; d=google.com; s=arc-20160816; b=ArXrWotdKzPL0jWV7wsbv4BwdRPpVBJkDrPSEMf6l+O8MP3wbz4AYCO4/3CdNmAY5c KmtRERZ4pffofdb3/fMCtTsPJl7u9NUCWu97nws29isIKCtN2P3kaoU5TpsaMQyMbTOQ kdl7S8ywmFA4w3m29LvhkksSkr8dVDjKAO0RcI2goEMKNhfZ37TilJGI2a7CCgc4Cmsp xrG2bq1dfS1mDCrjus7Vu2dce+uj6G04SYhKg3rb/0rgvy4F8+20fL724JbeZYYKxTLV LWBpX3cKcH3b4qRvdJ3yf/O8bJMMV3QTzNMJ6PZTROHKgujUOL8fbIiotSEQPm07bnWb XT/A== 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=+7eunD0OTU2yjHAOkU5WnoPs83gQX3uVzrbb3I5v9cs=; fh=Q5UJK/+TFmcTguj5mfgprzb0aHnD1zW+bK3PDJulktc=; b=SjpDfoF/kmRkaW+Izl1QH96BBefn00dWcNY130XH8p/KWzPeE2+Y5BuImXCXwF8A35 AjWEytff09TvihLIebEw5EAuo43qcMVB3uUUAP0v2yu89RtJPM0oPonij9xr9Ig4+Ci/ 6P0tftNtB8nJ24mUWF2LVBtKKsXPIhA2bPuWeW8KQnKqk+YtX+f0nZe6C5CIB0SoxD2D 1S3mhfW7Q6Z8xoz1s9r2hUg1t/7E3Gcxq/6VZHgfKrVRFEg7TkGmj7/lYQDGcTbDEmTk VTZMTmgun+Xyba8LySYxdTelSI8EPdr/nIh4MQrd9xeD2HLKAccUyp2ElzoUEFWI7aUQ m8SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=w77SsOuI; 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 k64-20020a638443000000b005ac61b76914si6686259pgd.93.2023.11.13.12.08.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 12:08:40 -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=w77SsOuI; 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 3CABB80AD509; Mon, 13 Nov 2023 12:08:32 -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 S231799AbjKMUIG (ORCPT + 30 others); Mon, 13 Nov 2023 15:08:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229816AbjKMUIC (ORCPT ); Mon, 13 Nov 2023 15:08:02 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D1F0D7E; Mon, 13 Nov 2023 12:07:58 -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 3ADHit5N019625; Mon, 13 Nov 2023 20:07:48 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-type : content-transfer-encoding; s=corp-2023-03-30; bh=+7eunD0OTU2yjHAOkU5WnoPs83gQX3uVzrbb3I5v9cs=; b=w77SsOuICMsJa6wr+X+N7k4P1k/uyHf9K7LOD2hU3LKQK6mIwqSYosOhvMbkoTqaGRnl v3Q/OBs2IYkVPxiEMq7qm+oxenaZUkRyAHAy/cCryrnU7ZIBbYkvGF9bAcz6wo1ld74c YNKS+Ln63MLxKjd8Lewlj/UsXjH9bobZEuBv48IBBUWd7QcogRM3p47cNtZZxpL3TXON s47yiIZqz7Mf8Clzw4o69BjPxlbMDK2nBNsgsXLFcodBALW0cNGYFPVZR8GRDYfC2KK+ DspEjtzKNv+huQJdaSCXczrFQgVwy2Qbq5fu1AUsyaBJ9ez0d0zyJLm5GpHM+QX7qeoj pg== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ua2m2bn3t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 20:07:47 +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 3ADIsDvf029856; Mon, 13 Nov 2023 20:07:46 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3uaxqqe8wp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 20:07:46 +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 3ADK7jMV026381; Mon, 13 Nov 2023 20:07:45 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-1; Mon, 13 Nov 2023 20:07:45 +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 1/4] platform/x86: hp-bioscfg: Simplify return check in hp_add_other_attributes() Date: Mon, 13 Nov 2023 12:07:37 -0800 Message-ID: <20231113200742.3593548-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_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: kDMwqjScWbYKHuT5TS74-DMazetyI6Hx X-Proofpoint-ORIG-GUID: kDMwqjScWbYKHuT5TS74-DMazetyI6Hx 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 12:08:32 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782480760395426291 X-GMAIL-MSGID: 1782480760395426291 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 --- v3->v4: Add R.B from Ilpo --- 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 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; } From patchwork Mon Nov 13 20:07:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Harshit Mogalapalli X-Patchwork-Id: 164634 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1447537vqg; Mon, 13 Nov 2023 12:08:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IG8SQd/8PyLutxxmL00mwzrPounJNwg5C9w+GQRurTrifuP+8j+2X/IBCoCRsuEj7XozieG X-Received: by 2002:a05:6a21:339e:b0:171:a8bc:74b2 with SMTP id yy30-20020a056a21339e00b00171a8bc74b2mr6308782pzb.7.1699906116031; Mon, 13 Nov 2023 12:08:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699906116; cv=none; d=google.com; s=arc-20160816; b=mOZl4Jy8ydeGwVZYASarJtPiANY73DwUhVJ+3KXAHwHPx0+n6WWsENw0Hoqk7JTVps Ox0vNawbLIz+d6Y/esdB9HhRRPx5yCBVmAta6G/h02Yf7xerjdqoEkZ8DZM4RODNL4Ir JZJS827CZibzDxj8egFFwniYX4K20K8nvbAJAsmUYSWikoBMIuWwBF62pVF0d3YAQE76 eCNP5V50OWPB+5Ly9j6jYkUaxY6mHHW8Ikx0ZuO+vBRmAVIgR9v0ekkNC2226k56Gvej dbjiXD+G5iWZbyyAkEzkoSa9XGYlrbjpOqWPN4k90PF9+tP1sYTFAWVyeKQcIrym0PNW spJw== 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=wRDNb5kwLbA9iZoe1kAxP+fQShQcH6es5bJIqUJvS3g=; fh=4fC3GxYxlzhBI33i5mhF9WKoN5XVaECBiUz/s3aJGuk=; b=CL7AGtH975UrfVEYE5wpvoXBp4aD/avHGM/1SylkSu2Rk9hMnQtHZyAvFi1pxSjo5Y ZTlQE2sj0lkUA84is0mBVVOcCsSk/N5k3XXu6KesDkNmZ16T6lb8HqVGVRAcDSp6NOQr Us1EzobWD09nOG9gYyIpSyNKEjtpCAA5/8uP7zz4YdmV1Uah+3SV28+WGZ+jY02T6mVB 8jvKXXkwHLGTKFKUy/BiFv5goFjCBl/gRJMIsPysvN2MYZ6ctUqKFzc0QuXdtRrBY8RD IvbT5xt7S4FTr876WD6YdJpJ7Bc4CxMNRohaaUOdfPwDoUGexzYhmxm7NsdEGr2A0S6R a6og== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=KhsOWGOj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id w6-20020a056a0014c600b006be322191e1si6772189pfu.254.2023.11.13.12.08.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 12:08:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=KhsOWGOj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 7D2F3805F3C5; Mon, 13 Nov 2023 12:08:33 -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 S231923AbjKMUIP (ORCPT + 30 others); Mon, 13 Nov 2023 15:08:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231787AbjKMUIM (ORCPT ); Mon, 13 Nov 2023 15:08:12 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C0C3C10F4; Mon, 13 Nov 2023 12:08:05 -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 3ADHipwW019571; Mon, 13 Nov 2023 20:07:53 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=wRDNb5kwLbA9iZoe1kAxP+fQShQcH6es5bJIqUJvS3g=; b=KhsOWGOjCaym6P4itiKotXonHl2TFZkKcYBWtXFg+NYW0OZOkAM+D87j9NJOSaniuARK Mf78OshxIUXjCCiX7nQfx3eusV5/UFeuBCQLhJ+0vwFMBIzKk0M17oqop1LPZnF1RvwK bOSPCp6kaG99Im3KYz2WgoudUqAv5vX8BmVh3NzkBs2jjFMdqhi7Zhp70azZwGazKpBj f86j9fmyQIqtXFUP/n93dxC75qBWdhJDyVszZsBI2xu3bFrYBgqz14mbx6y1o4ZrAxZy jDbfyp4WQa3V3K3YA2oj42XOG6qsCyr3FnKE7vThNyu4H+cNr/9DD0zuuCxebjTetfmr rA== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ua2m2bn40-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 20:07:53 +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 3ADIs0QQ029926; Mon, 13 Nov 2023 20:07:52 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3uaxqqe90n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 20:07:52 +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 3ADK7jMZ026381; Mon, 13 Nov 2023 20:07:51 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-3; Mon, 13 Nov 2023 20:07:51 +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, kernel test robot Subject: [PATCH v4 3/4] platform/x86: hp-bioscfg: Fix error handling in hp_add_other_attributes() Date: Mon, 13 Nov 2023 12:07:39 -0800 Message-ID: <20231113200742.3593548-3-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: 8vncgvzQNdwgDn8i-l236l5OQyNMstFQ X-Proofpoint-ORIG-GUID: 8vncgvzQNdwgDn8i-l236l5OQyNMstFQ 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 12:08:33 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782480755329034021 X-GMAIL-MSGID: 1782480755329034021 'attr_name_kobj' is allocated using kzalloc, but on all the error paths it is not freed, hence we have a memory leak. Fix the error path before kobject_init_and_add() 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 after kobject_init_and_add() 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 Reviewed-by: Ilpo Järvinen --- This is based on static analysis, only compile tested. v3->v4: Add more explicit statement on how we are fixing it, suggested by Ilpo --- 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 20:07:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Harshit Mogalapalli X-Patchwork-Id: 164636 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp1447797vqg; Mon, 13 Nov 2023 12:09:04 -0800 (PST) X-Google-Smtp-Source: AGHT+IFWlFBy1yJ90JBYHZEN789ul7qGKu0bpjyg+2tWv+VHiTkxdD71G+A9izphRhfw3deKQXpA X-Received: by 2002:a05:6830:344c:b0:6d6:4d8f:56d6 with SMTP id b12-20020a056830344c00b006d64d8f56d6mr184222otu.13.1699906144443; Mon, 13 Nov 2023 12:09:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699906144; cv=none; d=google.com; s=arc-20160816; b=BLkuxIhgIIBAbeW9NSb92ixs+SHfzuvUR63+ivfjNuk00eEi2cqTXAWf0mrUKjR9By RIq6SZXhIw/kBBAb1D7A11cefcxjxa/IKYbUx7n74oRtUpkdd7TdH58UZ0LiNHYURPiP QBAwGPOt9PYOUtKOuqt6NM/fvdOUAOgnYktRBllMni4a1xYG+p6C7ycEzRwxGqvdlcvb RFiEK4LT9rC+Fn8LdYbN6YY6BuRrs/s3uGM6WqKZarRRQcq//DqBOzliOcWBTalMWZVg jL/O7o47Qt0hGlaZuJclEJmsRprkmNZfOCCUzvxye4ZEIWdxX3H9vSya6Hxx5v+k7qQJ opgw== 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=XDtSBsTn2b+kLXz7T7QRWj63RVMlaoXCIevLvCLxJ70=; fh=Q5UJK/+TFmcTguj5mfgprzb0aHnD1zW+bK3PDJulktc=; b=uAQw2pe1cOrRKiUC60eAzThhCQp06LzCMvJ3P/oDDeeXfULWQkGtq894Vn6BagXWsA Mt2q3fK7hkJLORxINRgJyChPAvz7R8+/POuPIH3Rpmnor83PXnlA4OF6d/Ae7EBchYE4 GOwQH0Oy3+MnwOP5zqZb58GNBB9+gK45+X329s9ReY+F8iEiDKExvEtzG9um2pCaRYAW wVuA4f+BwhdMUCmimimSqPU2lHbWxREHBmDzZxBWMF9Uner7F/SKkXQzRPAOZ1JEgX14 FWK60cJTXjjNPmex1b4AvaaZw51nOS6Y2AyfPl6W7oW9le68mj9nzvBrPqZVElb6ayRS QcVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=LJdy6XDI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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. [2620:137:e000::3:8]) by mx.google.com with ESMTPS id i62-20020a638741000000b005ab7b51ab6csi6058909pge.515.2023.11.13.12.09.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Nov 2023 12:09:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8; Authentication-Results: mx.google.com; dkim=pass header.i=@oracle.com header.s=corp-2023-03-30 header.b=LJdy6XDI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 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 A5A8680AD517; Mon, 13 Nov 2023 12:09:01 -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 S231860AbjKMUIh (ORCPT + 30 others); Mon, 13 Nov 2023 15:08:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231911AbjKMUIf (ORCPT ); Mon, 13 Nov 2023 15:08:35 -0500 Received: from mx0a-00069f02.pphosted.com (mx0a-00069f02.pphosted.com [205.220.165.32]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 591A1D73; Mon, 13 Nov 2023 12:08:32 -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 3ADHiQqF005408; Mon, 13 Nov 2023 20:08:24 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=XDtSBsTn2b+kLXz7T7QRWj63RVMlaoXCIevLvCLxJ70=; b=LJdy6XDIxi9TQ4h7uls8OEJ8nZkTlBTV0t8QxzSz0UWVUdzi+ePBs3mC2qgZbHgtK3tv Kee3+NCOD1hLXE73bNBY7qEz69/YXnJOv1sUFS4KpyYwJZCHteDSbysgEGqKi1M6DhYH 2aR6c3vfNKAZ3PO1Ma42wXwlaQdd5QjIBfUIA4OcXzLacNRfZ6gpdPrdMFKLBys4qUzp ERtra5gwVg9+IGtD8zvtez9N9eRnF9Juvmes1wEBmcDHfnoi8Fy3J7or9OsewsT4vfNY 3SLHdaHRHyyz33p+vPWFlLhP5uZg+34r8CaOzjr4LXvXxnxFCE58/+C0+t45jvMuJVqQ Wg== Received: from iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (iadpaimrmta02.appoci.oracle.com [147.154.18.20]) by mx0b-00069f02.pphosted.com (PPS) with ESMTPS id 3ua2n3bmf8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 20:08:24 +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 3ADJBbRj029773; Mon, 13 Nov 2023 20:08:22 GMT Received: from pps.reinject (localhost [127.0.0.1]) by iadpaimrmta02.imrmtpd1.prodappiadaev1.oraclevcn.com (PPS) with ESMTPS id 3uaxqqe9h3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 20:08:22 +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 3ADK7jMb026381; Mon, 13 Nov 2023 20:08:19 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-4; Mon, 13 Nov 2023 20:08:19 +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 4/4] platform/x86: hp-bioscfg: Remove unused obj in hp_add_other_attributes() Date: Mon, 13 Nov 2023 12:07:40 -0800 Message-ID: <20231113200742.3593548-4-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-2311130160 X-Proofpoint-GUID: tTpdJjZZ50TmSNtiiGd8B6eNI1NPnQc0 X-Proofpoint-ORIG-GUID: tTpdJjZZ50TmSNtiiGd8B6eNI1NPnQc0 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 12:09:01 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782480785379169942 X-GMAIL-MSGID: 1782480785379169942 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 --- 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; }