From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 22A5F81783 for ; Wed, 11 Jan 2017 02:08:14 -0800 (PST) Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga101.jf.intel.com with ESMTP; 11 Jan 2017 02:08:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.33,345,1477983600"; d="scan'208";a="47765666" Received: from shzintpr02.sh.intel.com (HELO [10.7.209.38]) ([10.239.4.160]) by orsmga004.jf.intel.com with ESMTP; 11 Jan 2017 02:08:13 -0800 To: Chris Phillips , "edk2-devel@lists.01.org" References: <2f986db7-7f13-43e4-b76d-fe9dcead5edc@AIA2PHNNRN.local> <0C09AFA07DD0434D9E2A0C6AEB0483103B815A02@shsmsx102.ccr.corp.intel.com> Cc: "Ni, Ruiyu" , star.zeng@intel.com From: "Zeng, Star" Message-ID: Date: Wed, 11 Jan 2017 18:07:42 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <0C09AFA07DD0434D9E2A0C6AEB0483103B815A02@shsmsx102.ccr.corp.intel.com> Subject: Re: [PATCH v2] Nt32Pkg: Fix code to correctly set SMBIOS Type 2 Length X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Jan 2017 10:08:14 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Chris, Since no other comments received, do you need me to help push the SMBIOS related patches? Thanks, Star On 2017/1/11 9:36, Zeng, Star wrote: > Reviewed-by: Star Zeng > > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Chris Phillips > Sent: Wednesday, January 11, 2017 12:49 AM > To: edk2-devel@lists.01.org > Cc: Ni, Ruiyu > Subject: [edk2] [PATCH v2] Nt32Pkg: Fix code to correctly set SMBIOS Type 2 Length > > When running Nt32Pkg, SMBIOS Type 2 had the wrong Length. > Fixed the code to use the correct structure in sizeof, and properly account for ContainedObjectHandles. > Also updated variable names with Assert -> Asset > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Chris Phillips > --- > .../MiscBaseBoardManufacturerFunction.c | 32 +++++++++++++--------- > 1 file changed, 19 insertions(+), 13 deletions(-) > > diff --git a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction.c b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction.c > index 303726c3fd..765627a8e6 100644 > --- a/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction.c > +++ b/Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction. > +++ c > @@ -3,6 +3,7 @@ > SMBIOS type 2. > > Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.
> +(C) Copyright 2017 Hewlett Packard Enterprise Development LP
> 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 @@ -31,7 +32,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer) > UINTN ManuStrLen; > UINTN ProductStrLen; > UINTN VerStrLen; > - UINTN AssertTagStrLen; > + UINTN AssetTagStrLen; > UINTN SerialNumStrLen; > UINTN ChassisStrLen; > EFI_STATUS Status; > @@ -39,7 +40,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer) > EFI_STRING Product; > EFI_STRING Version; > EFI_STRING SerialNumber; > - EFI_STRING AssertTag; > + EFI_STRING AssetTag; > EFI_STRING Chassis; > STRING_REF TokenToGet; > EFI_SMBIOS_HANDLE SmbiosHandle; > @@ -84,9 +85,9 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer) > } > > TokenToGet = STRING_TOKEN (STR_MISC_BASE_BOARD_ASSET_TAG); > - AssertTag = HiiGetPackageString(&gEfiCallerIdGuid, TokenToGet, NULL); > - AssertTagStrLen = StrLen(AssertTag); > - if (AssertTagStrLen > SMBIOS_STRING_MAX_LENGTH) { > + AssetTag = HiiGetPackageString(&gEfiCallerIdGuid, TokenToGet, NULL); > + AssetTagStrLen = StrLen(AssetTag); if (AssetTagStrLen > > + SMBIOS_STRING_MAX_LENGTH) { > return EFI_UNSUPPORTED; > } > > @@ -101,11 +102,16 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer) > // > // Two zeros following the last string. > // > - SmbiosRecord = AllocatePool(sizeof (SMBIOS_TABLE_TYPE3) + ManuStrLen + 1 + ProductStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1 + AssertTagStrLen + 1 + ChassisStrLen +1 + 1); > - ZeroMem(SmbiosRecord, sizeof (SMBIOS_TABLE_TYPE3) + ManuStrLen + 1 + ProductStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1 + AssertTagStrLen + 1 + ChassisStrLen +1 + 1); > + // Since we fill NumberOfContainedObjectHandles = 0, remove sizeof > + (UINT16) bytes for ContainedObjectHandles[1] // SmbiosRecord = > + AllocatePool(sizeof (SMBIOS_TABLE_TYPE2) - sizeof (UINT16) + > + ManuStrLen + 1 + ProductStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + > + 1 + AssetTagStrLen + 1 + ChassisStrLen + 1 + 1); > + ZeroMem(SmbiosRecord, sizeof (SMBIOS_TABLE_TYPE2) - sizeof (UINT16) + > + ManuStrLen + 1 + ProductStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + > + 1 + AssetTagStrLen + 1 + ChassisStrLen + 1 + 1); > > SmbiosRecord->Hdr.Type = EFI_SMBIOS_TYPE_BASEBOARD_INFORMATION; > - SmbiosRecord->Hdr.Length = sizeof (SMBIOS_TABLE_TYPE2); > + // > + // Since we fill NumberOfContainedObjectHandles = 0, remove sizeof > + (UINT16) bytes for ContainedObjectHandles[1] // > + SmbiosRecord->Hdr.Length = sizeof (SMBIOS_TABLE_TYPE2) - sizeof > + (UINT16); > // > // Make handle chosen by smbios protocol.add automatically. > // > @@ -127,7 +133,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer) > // > SmbiosRecord->SerialNumber = 4; > // > - // AssertTag will be the 5th optional string following the formatted structure. > + // AssetTag will be the 5th optional string following the formatted structure. > // > SmbiosRecord->AssetTag = 5; > > @@ -142,15 +148,15 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer) > > OptionalStrStart = (CHAR8 *)(SmbiosRecord + 1); > // > - // Since we fill NumberOfContainedObjectHandles = 0 for simple, just after this filed to fill string > + // Since we fill NumberOfContainedObjectHandles = 0, just after this > + field to fill string > // > - OptionalStrStart -= 2; > + OptionalStrStart -= sizeof (UINT16); > UnicodeStrToAsciiStr(Manufacturer, OptionalStrStart); > UnicodeStrToAsciiStr(Product, OptionalStrStart + ManuStrLen + 1); > UnicodeStrToAsciiStr(Version, OptionalStrStart + ManuStrLen + 1 + ProductStrLen + 1); > UnicodeStrToAsciiStr(SerialNumber, OptionalStrStart + ManuStrLen + 1 + ProductStrLen + 1 + VerStrLen + 1); > - UnicodeStrToAsciiStr(AssertTag, OptionalStrStart + ManuStrLen + 1 + ProductStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1); > - UnicodeStrToAsciiStr(Chassis, OptionalStrStart + ManuStrLen + 1 + ProductStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1 + AssertTagStrLen + 1); > + UnicodeStrToAsciiStr(AssetTag, OptionalStrStart + ManuStrLen + 1 + > + ProductStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1); > + UnicodeStrToAsciiStr(Chassis, OptionalStrStart + ManuStrLen + 1 + > + ProductStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1 + > + AssetTagStrLen + 1); > // > // Now we have got the full smbios record, call smbios protocol to add this record. > // > -- > 2.11.0.windows.1 > > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel >