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.43; helo=mga05.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 21DB82214E358 for ; Mon, 11 Dec 2017 01:35:29 -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 fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Dec 2017 01:40:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,391,1508828400"; d="scan'208";a="183182152" Received: from ray-dev.ccr.corp.intel.com (HELO [10.239.9.14]) ([10.239.9.14]) by orsmga005.jf.intel.com with ESMTP; 11 Dec 2017 01:40:05 -0800 To: "Song, BinX" , "edk2-devel@lists.01.org" Cc: "lersek@redhat.com" , "Dong, Eric" References: <559D2DF22BC9A3468B4FA1AA547F0EF1025C1CB5@shsmsx102.ccr.corp.intel.com> From: "Ni, Ruiyu" Message-ID: <03c857ea-b316-5307-5489-e5ddf967b295@Intel.com> Date: Mon, 11 Dec 2017 17:40:05 +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: <559D2DF22BC9A3468B4FA1AA547F0EF1025C1CB5@shsmsx102.ccr.corp.intel.com> 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 09:35:30 -0000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit On 12/11/2017 4:16 PM, Song, BinX wrote: > 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/UefiCpuPkg/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. > +// > #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/RegisterCpuFeaturesLib.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 ( > } > > /** > + 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 ( Can we rename this function name to "RegisterCpuFeatureLibIsFeatureValid"? > + IN UINT32 Feature > + ) > +{ > + UINT32 Data; > + > + Data = Feature; > + Data &= ~(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. Can we just say "CPU_FEATURE_PROC_TRACE" is the MAX feature we support? > + // > + 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 +471,7 @@ RegisterCpuFeature ( > > VA_START (Marker, InitializeFunc); > Feature = VA_ARG (Marker, UINT32); > + ASSERT (IsFeatureValidCheck(Feature)); > while (Feature != CPU_FEATURE_END) { > ASSERT ((Feature & (CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER)) > != (CPU_FEATURE_BEFORE | CPU_FEATURE_AFTER)); > -- Thanks, Ray