tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <chrisp@hpe.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>
This commit is contained in:
Chris Phillips 2017-01-11 00:48:45 +08:00 committed by Star Zeng
parent f15908aa03
commit fed77c5fea
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Nt32Pkg/MiscSubClassPlatformDxe/MiscBaseBoardManufacturerFunction.c
View File

@ -3,6 +3,7 @@
SMBIOS type 2. SMBIOS type 2.
Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2011, Intel Corporation. All rights reserved.<BR>
(C) Copyright 2017 Hewlett Packard Enterprise Development LP<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License 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 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 ManuStrLen;
UINTN ProductStrLen; UINTN ProductStrLen;
UINTN VerStrLen; UINTN VerStrLen;
UINTN AssertTagStrLen; UINTN AssetTagStrLen;
UINTN SerialNumStrLen; UINTN SerialNumStrLen;
UINTN ChassisStrLen; UINTN ChassisStrLen;
EFI_STATUS Status; EFI_STATUS Status;
@ -39,7 +40,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer)
EFI_STRING Product; EFI_STRING Product;
EFI_STRING Version; EFI_STRING Version;
EFI_STRING SerialNumber; EFI_STRING SerialNumber;
EFI_STRING AssertTag; EFI_STRING AssetTag;
EFI_STRING Chassis; EFI_STRING Chassis;
STRING_REF TokenToGet; STRING_REF TokenToGet;
EFI_SMBIOS_HANDLE SmbiosHandle; EFI_SMBIOS_HANDLE SmbiosHandle;
@ -84,9 +85,9 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer)
} }
TokenToGet = STRING_TOKEN (STR_MISC_BASE_BOARD_ASSET_TAG); TokenToGet = STRING_TOKEN (STR_MISC_BASE_BOARD_ASSET_TAG);
AssertTag = HiiGetPackageString(&gEfiCallerIdGuid, TokenToGet, NULL); AssetTag = HiiGetPackageString(&gEfiCallerIdGuid, TokenToGet, NULL);
AssertTagStrLen = StrLen(AssertTag); AssetTagStrLen = StrLen(AssetTag);
if (AssertTagStrLen > SMBIOS_STRING_MAX_LENGTH) { if (AssetTagStrLen > SMBIOS_STRING_MAX_LENGTH) {
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }
@ -101,11 +102,16 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer)
// //
// Two zeros following the last string. // 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); // Since we fill NumberOfContainedObjectHandles = 0, remove sizeof (UINT16) bytes for ContainedObjectHandles[1]
ZeroMem(SmbiosRecord, sizeof (SMBIOS_TABLE_TYPE3) + ManuStrLen + 1 + ProductStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1 + AssertTagStrLen + 1 + ChassisStrLen +1 + 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.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. // Make handle chosen by smbios protocol.add automatically.
// //
@ -127,7 +133,7 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer)
// //
SmbiosRecord->SerialNumber = 4; 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; SmbiosRecord->AssetTag = 5;
@ -142,15 +148,15 @@ MISC_SMBIOS_TABLE_FUNCTION(MiscBaseBoardManufacturer)
OptionalStrStart = (CHAR8 *)(SmbiosRecord + 1); 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(Manufacturer, OptionalStrStart);
UnicodeStrToAsciiStr(Product, OptionalStrStart + ManuStrLen + 1); UnicodeStrToAsciiStr(Product, OptionalStrStart + ManuStrLen + 1);
UnicodeStrToAsciiStr(Version, OptionalStrStart + ManuStrLen + 1 + ProductStrLen + 1); UnicodeStrToAsciiStr(Version, OptionalStrStart + ManuStrLen + 1 + ProductStrLen + 1);
UnicodeStrToAsciiStr(SerialNumber, OptionalStrStart + ManuStrLen + 1 + ProductStrLen + 1 + VerStrLen + 1); UnicodeStrToAsciiStr(SerialNumber, OptionalStrStart + ManuStrLen + 1 + ProductStrLen + 1 + VerStrLen + 1);
UnicodeStrToAsciiStr(AssertTag, OptionalStrStart + ManuStrLen + 1 + ProductStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1); UnicodeStrToAsciiStr(AssetTag, OptionalStrStart + ManuStrLen + 1 + ProductStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1);
UnicodeStrToAsciiStr(Chassis, OptionalStrStart + ManuStrLen + 1 + ProductStrLen + 1 + VerStrLen + 1 + SerialNumStrLen + 1 + AssertTagStrLen + 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. // Now we have got the full smbios record, call smbios protocol to add this record.
// //