From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Permerror (SPF Permanent Error: More than 10 MX records returned) identity=mailfrom; client-ip=134.134.136.65; helo=mga03.intel.com; envelope-from=eric.dong@intel.com; receiver=edk2-devel@lists.01.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) (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 1E3A52214E358 for ; Mon, 11 Dec 2017 00:19:15 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Dec 2017 00:23:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,391,1508828400"; d="scan'208";a="1576799" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga008.fm.intel.com with ESMTP; 11 Dec 2017 00:23:52 -0800 Received: from fmsmsx112.amr.corp.intel.com (10.18.116.6) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 11 Dec 2017 00:23:52 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX112.amr.corp.intel.com (10.18.116.6) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 11 Dec 2017 00:23:52 -0800 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.175]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.93]) with mapi id 14.03.0319.002; Mon, 11 Dec 2017 16:23:50 +0800 From: "Dong, Eric" To: "Song, BinX" , "edk2-devel@lists.01.org" CC: "lersek@redhat.com" Thread-Topic: [PATCH] UefiCpuPkg: Check invalid RegisterCpuFeature parameter Thread-Index: AdNyWEaEvGgYJVSAQvqp+Guyv2HCDQAAQtag Date: Mon, 11 Dec 2017 08:23:50 +0000 Message-ID: References: <559D2DF22BC9A3468B4FA1AA547F0EF1025C1CB5@shsmsx102.ccr.corp.intel.com> In-Reply-To: <559D2DF22BC9A3468B4FA1AA547F0EF1025C1CB5@shsmsx102.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [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: , X-List-Received-Date: Mon, 11 Dec 2017 08:19:16 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Eric Dong -----Original Message----- From: Song, BinX=20 Sent: Monday, December 11, 2017 4:16 PM To: edk2-devel@lists.01.org Cc: Dong, Eric; lersek@redhat.com Subject: [PATCH] UefiCpuPkg: Check invalid RegisterCpuFeature parameter 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 --- .../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=20 +feature // with the max CPU feature in the IsFeatureValidCheck() function. +// #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 |=20 +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)); -- 2.10.2.windows.1