From nobody Fri May 3 03:30:04 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 1512980166204751.7499445971514; Mon, 11 Dec 2017 00:16:06 -0800 (PST) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 65583220FB322; Mon, 11 Dec 2017 00:11:27 -0800 (PST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id F24222214E322 for ; Mon, 11 Dec 2017 00:11:25 -0800 (PST) Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Dec 2017 00:16:02 -0800 Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga008.fm.intel.com with ESMTP; 11 Dec 2017 00:16:02 -0800 Received: from FMSMSX110.amr.corp.intel.com (10.18.116.10) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 11 Dec 2017 00:16:02 -0800 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx110.amr.corp.intel.com (10.18.116.10) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 11 Dec 2017 00:16:02 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.175]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.218]) with mapi id 14.03.0319.002; Mon, 11 Dec 2017 16:16:00 +0800 X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Permerror (SPF Permanent Error: More than 10 MX records returned) identity=mailfrom; client-ip=192.55.52.136; helo=mga12.intel.com; envelope-from=binx.song@intel.com; receiver=edk2-devel@lists.01.org X-Amp-Result: UNKNOWN X-Amp-Original-Verdict: FILE UNKNOWN X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,391,1508828400"; d="dat'59?scan'59,208,59";a="1575699" From: "Song, BinX" To: "edk2-devel@lists.01.org" Thread-Topic: [PATCH] UefiCpuPkg: Check invalid RegisterCpuFeature parameter Thread-Index: AdNyWEaEvGgYJVSAQvqp+Guyv2HCDQ== Date: Mon, 11 Dec 2017 08:16:00 +0000 Message-ID: <559D2DF22BC9A3468B4FA1AA547F0EF1025C1CB5@shsmsx102.ccr.corp.intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: <559D2DF22BC9A3468B4FA1AA547F0EF1025C1CB5@shsmsx102.ccr.corp.intel.com> dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 X-Content-Filtered-By: Mailman/MimeDel 2.1.22 Subject: [edk2] [PATCH] UefiCpuPkg: Check invalid RegisterCpuFeature parameter X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "lersek@redhat.com" , "Dong, Eric" Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail: RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Check and assert invalid RegisterCpuFeature function parameter Cc: Eric Dong Cc: Laszlo Ersek Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Bell Song Reviewed-by: Eric Dong --- .../Include/Library/RegisterCpuFeaturesLib.h | 4 ++++ .../RegisterCpuFeaturesLib.c | 28 ++++++++++++++++++= ++++ 2 files changed, 32 insertions(+) diff --git a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h b/UefiCpuP= kg/Include/Library/RegisterCpuFeaturesLib.h index 9331e49..54244cd 100644 --- a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h +++ b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h @@ -72,6 +72,10 @@ #define CPU_FEATURE_ENERGY_PERFORMANCE_BIAS (32+10) #define CPU_FEATURE_PPIN (32+11) +// +// When you add new CPU features, please also replace the minor CPU feature +// with the max CPU feature in the IsFeatureValidCheck() function.=20 +// #define CPU_FEATURE_PROC_TRACE (32+12) #define CPU_FEATURE_BEFORE_ALL BIT27 #define CPU_FEATURE_AFTER_ALL BIT28 diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesL= ib.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c index dd6a82b..f75d900 100644 --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c @@ -81,6 +81,33 @@ DumpCpuFeature ( } =20 /** + Determines if the CPU feature is valid. + + @param[in] Feature Pointer to CPU feature + + @retval TRUE The CPU feature is valid. + @retval FALSE The CPU feature is invalid. +**/ +BOOLEAN +IsFeatureValidCheck ( + IN UINT32 Feature + ) +{ + UINT32 Data; + + Data =3D Feature; + Data &=3D ~(CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER | CPU_FEATURE_BEFORE_= ALL | CPU_FEATURE_AFTER_ALL); + // + // Please replace CPU feature below with the MAX one if have. + // + if (Data > CPU_FEATURE_PROC_TRACE) { + DEBUG ((DEBUG_ERROR, "Invalid CPU feature: 0x%x ", Feature)); + return FALSE; + } + return TRUE; +} + +/** Determines if the feature bit mask is in dependent CPU feature bit mask = buffer. =20 @param[in] FeatureMask Pointer to CPU feature bit mask @@ -444,6 +471,7 @@ RegisterCpuFeature ( =20 VA_START (Marker, InitializeFunc); Feature =3D VA_ARG (Marker, UINT32); + ASSERT (IsFeatureValidCheck(Feature)); while (Feature !=3D CPU_FEATURE_END) { ASSERT ((Feature & (CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER)) !=3D (CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER)); --=20 2.10.2.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel