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=192.55.52.136; helo=mga12.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org 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 26B782214E322 for ; Tue, 12 Dec 2017 18:37:38 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Dec 2017 18:42:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,396,1508828400"; d="scan'208";a="183713584" Received: from ray-dev.ccr.corp.intel.com (HELO [10.239.9.14]) ([10.239.9.14]) by orsmga005.jf.intel.com with ESMTP; 12 Dec 2017 18:42:15 -0800 To: "Song, BinX" , "edk2-devel@lists.01.org" Cc: "lersek@redhat.com" , "Dong, Eric" References: <559D2DF22BC9A3468B4FA1AA547F0EF1025C22DA@shsmsx102.ccr.corp.intel.com> From: "Ni, Ruiyu" Message-ID: <6cbd0d4e-f3d7-5396-ffb5-cc221063a265@Intel.com> Date: Wed, 13 Dec 2017 10:42:14 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <559D2DF22BC9A3468B4FA1AA547F0EF1025C22DA@shsmsx102.ccr.corp.intel.com> Subject: Re: [PATCH V2] 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: Wed, 13 Dec 2017 02:37:38 -0000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit On 12/13/2017 10:35 AM, Song, BinX wrote: > V2: > Update function name, add more detail description. > V1: > 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 | 5 ++++ > .../RegisterCpuFeaturesLib.c | 29 ++++++++++++++++++++++ > 2 files changed, 34 insertions(+) > > diff --git a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h > index 9331e49..fc3ccda 100644 > --- a/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h > +++ b/UefiCpuPkg/Include/Library/RegisterCpuFeaturesLib.h > @@ -71,6 +71,11 @@ > #define CPU_FEATURE_APIC_TPR_UPDATE_MESSAGE (32+9) > #define CPU_FEATURE_ENERGY_PERFORMANCE_BIAS (32+10) > #define CPU_FEATURE_PPIN (32+11) > +// > +// Currently, CPU_FEATURE_PROC_TRACE is the MAX feature we support. > +// If you define a feature bigger than it, please also replace it > +// in RegisterCpuFeatureLibIsFeatureValid function. > +// > #define CPU_FEATURE_PROC_TRACE (32+12) > > #define CPU_FEATURE_BEFORE_ALL BIT27 > diff --git a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c > index dd6a82b..6ec26e1 100644 > --- a/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c > +++ b/UefiCpuPkg/Library/RegisterCpuFeaturesLib/RegisterCpuFeaturesLib.c > @@ -81,6 +81,34 @@ DumpCpuFeature ( > } > > /** > + 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 > +RegisterCpuFeatureLibIsFeatureValid ( > + IN UINT32 Feature > + ) > +{ > + UINT32 Data; > + > + Data = Feature; > + Data &= ~(CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER | CPU_FEATURE_BEFORE_ALL | CPU_FEATURE_AFTER_ALL); > + // > + // Currently, CPU_FEATURE_PROC_TRACE is the MAX feature we support. > + // If you define a feature bigger than it, please replace it at below. > + // > + 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. > > @param[in] FeatureMask Pointer to CPU feature bit mask > @@ -444,6 +472,7 @@ RegisterCpuFeature ( > > VA_START (Marker, InitializeFunc); > Feature = VA_ARG (Marker, UINT32); > + ASSERT (RegisterCpuFeatureLibIsFeatureValid(Feature)); > while (Feature != CPU_FEATURE_END) { > ASSERT ((Feature & (CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER)) > != (CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER)); > Reviewed-by: Ruiyu Ni -- Thanks, Ray