From nobody Thu Dec 26 01:19:09 2024 Delivered-To: importer@patchew.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; 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 1505388554340876.1380803947171; Thu, 14 Sep 2017 04:29:14 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 2055521E2BE29; Thu, 14 Sep 2017 04:26:14 -0700 (PDT) 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 E0EAC21D492CA for ; Thu, 14 Sep 2017 04:26:12 -0700 (PDT) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Sep 2017 04:29:11 -0700 Received: from shwdeopenpsi068.ccr.corp.intel.com ([10.239.9.31]) by fmsmga005.fm.intel.com with ESMTP; 14 Sep 2017 04:29:10 -0700 X-Original-To: edk2-devel@lists.01.org X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,392,1500966000"; d="scan'208";a="151255071" From: Star Zeng To: edk2-devel@lists.01.org Date: Thu, 14 Sep 2017 19:29:07 +0800 Message-Id: <1505388547-5292-1-git-send-email-star.zeng@intel.com> X-Mailer: git-send-email 2.7.0.windows.1 Subject: [edk2] [PATCH] MdeModulePkg SmbiosMeasurementDxe: Skip measurement for OEM type 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: Jiewen Yao , Star Zeng MIME-Version: 1.0 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" The generic driver has no way to know whether an OEM type should be filtered or not. This patch is to update the code to skip measurement for OEM type and platform code can measure it by self if required. Cc: Jiewen Yao Cc: Chasel Chiu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Star Zeng Reviewed-by: Chasel Chiu --- .../SmbiosMeasurementDxe/SmbiosMeasurementDxe.c | 54 +++++++++++++-----= ---- .../SmbiosMeasurementDxe/SmbiosMeasurementDxe.inf | 5 +- 2 files changed, 34 insertions(+), 25 deletions(-) diff --git a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementD= xe.c b/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.c index bc5e7464e133..4a3e99aefd0f 100644 --- a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.c +++ b/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.c @@ -1,7 +1,7 @@ /** @file This driver measures SMBIOS table to TPM. =20 -Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
+Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions of the BSD = License which accompanies this distribution. The full text of the license may be = found at @@ -277,30 +277,38 @@ FilterSmbiosEntry ( DEBUG ((EFI_D_INFO, "Smbios Table (Type - %d):\n", ((SMBIOS_STRUCTURE *)= TableEntry)->Type)); DEBUG_CODE (InternalDumpHex (TableEntry, TableEntrySize);); =20 - FilterStruct =3D GetFilterStructByType (((SMBIOS_STRUCTURE *)TableEntry)= ->Type); - if (FilterStruct !=3D NULL) { - if (FilterStruct->Filter =3D=3D NULL || FilterStruct->FilterCount =3D= =3D 0) { - // zero all table entries, except header - ZeroMem ((UINT8 *)TableEntry + sizeof(SMBIOS_STRUCTURE), TableEntryS= ize - sizeof(SMBIOS_STRUCTURE)); - } else { - Filter =3D FilterStruct->Filter; - for (Index =3D 0; Index < FilterStruct->FilterCount; Index++) { - if (((SMBIOS_STRUCTURE *) TableEntry)->Length >=3D (Filter[Index].= Offset + Filter[Index].Size)) { - // - // The field is present in the SMBIOS entry. - // - if ((Filter[Index].Flags & SMBIOS_FILTER_TABLE_FLAG_IS_STRING) != =3D 0) { - CopyMem (&StringId, (UINT8 *)TableEntry + Filter[Index].Offset= , sizeof(StringId)); - if (StringId !=3D 0) { - // set ' ' for string field - String =3D GetSmbiosStringById (TableEntry, StringId, &Strin= gLen); - ASSERT (String !=3D NULL); - //DEBUG ((EFI_D_INFO,"StrId(0x%x)-%a(%d)\n", StringId, Strin= g, StringLen)); - SetMem (String, StringLen, ' '); + // + // Skip measurement for OEM types. + // + if (((SMBIOS_STRUCTURE *)TableEntry)->Type >=3D SMBIOS_OEM_BEGIN) { + // zero all table fields, except header + ZeroMem ((UINT8 *)TableEntry + sizeof(SMBIOS_STRUCTURE), TableEntrySiz= e - sizeof(SMBIOS_STRUCTURE)); + } else { + FilterStruct =3D GetFilterStructByType (((SMBIOS_STRUCTURE *)TableEntr= y)->Type); + if (FilterStruct !=3D NULL) { + if (FilterStruct->Filter =3D=3D NULL || FilterStruct->FilterCount = =3D=3D 0) { + // zero all table fields, except header + ZeroMem ((UINT8 *)TableEntry + sizeof(SMBIOS_STRUCTURE), TableEntr= ySize - sizeof(SMBIOS_STRUCTURE)); + } else { + Filter =3D FilterStruct->Filter; + for (Index =3D 0; Index < FilterStruct->FilterCount; Index++) { + if (((SMBIOS_STRUCTURE *) TableEntry)->Length >=3D (Filter[Index= ].Offset + Filter[Index].Size)) { + // + // The field is present in the SMBIOS entry. + // + if ((Filter[Index].Flags & SMBIOS_FILTER_TABLE_FLAG_IS_STRING)= !=3D 0) { + CopyMem (&StringId, (UINT8 *)TableEntry + Filter[Index].Offs= et, sizeof(StringId)); + if (StringId !=3D 0) { + // set ' ' for string field + String =3D GetSmbiosStringById (TableEntry, StringId, &Str= ingLen); + ASSERT (String !=3D NULL); + //DEBUG ((EFI_D_INFO,"StrId(0x%x)-%a(%d)\n", StringId, Str= ing, StringLen)); + SetMem (String, StringLen, ' '); + } } + // zero non-string field + ZeroMem ((UINT8 *)TableEntry + Filter[Index].Offset, Filter[In= dex].Size); } - // zero non-string field - ZeroMem ((UINT8 *)TableEntry + Filter[Index].Offset, Filter[Inde= x].Size); } } } diff --git a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementD= xe.inf b/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.i= nf index c5a779cca7fe..5d3aa67f7c8b 100644 --- a/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.inf +++ b/MdeModulePkg/Universal/SmbiosMeasurementDxe/SmbiosMeasurementDxe.inf @@ -7,10 +7,11 @@ # such as clock registers, and system unique information, such as # asset numbers or serial numbers, MUST NOT be measured into PCR [1], # or any other PCR. -# +# The OEM types are skipped and platform code can measure them by self if = required. +#=20 # A platform may use its own policy to filter some fields in SMBIOS table. # -# Copyright (c) 2015, Intel Corporation. All rights reserved.
+# Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.
# # This program and the accompanying materials # are licensed and made available under the terms and conditions of the B= SD License --=20 2.7.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel