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

Fix the issue that if OEM SMBIOS data includes string, it will cause SmbiosFldMiscTypeOEM buffer overflow. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10569 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
li-elvin 2010-06-09 02:04:12 +00:00
parent 7830363c37
commit 2788ff5116
3 changed files with 78 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/ConvLib.c
View File

@ -2,7 +2,7 @@
Common filling functions used in translating Datahub's record Common filling functions used in translating Datahub's record
to PI SMBIOS's record. to PI SMBIOS's record.
Copyright (c) 2009, Intel Corporation. All rights reserved.<BR> Copyright (c) 2009 - 2010, Intel Corporation. All rights reserved.<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
@ -158,6 +158,49 @@ SmbiosEnlargeStructureBuffer (
return EFI_SUCCESS; return EFI_SUCCESS;
} }
/**
Update the structure buffer of a structure node in SMBIOS database.
The function lead the structure pointer for SMBIOS record changed.
@param StructureNode The structure node whose structure buffer is to be enlarged.
@param NewRecord The new SMBIOS record.
**/
VOID
SmbiosUpdateStructureBuffer (
IN OUT SMBIOS_STRUCTURE_NODE *StructureNode,
IN EFI_SMBIOS_TABLE_HEADER *NewRecord
)
{
EFI_SMBIOS_PROTOCOL *Smbios;
EFI_STATUS Status;
UINT8 CountOfString;
Smbios = GetSmbiosProtocol();
ASSERT (Smbios != NULL);
Status = Smbios->Remove (Smbios, StructureNode->SmbiosHandle);
ASSERT_EFI_ERROR (Status);
//
// try to use original handle to enlarge the buffer.
//
Status = Smbios->Add (Smbios, NULL, &StructureNode->SmbiosHandle, NewRecord);
ASSERT_EFI_ERROR (Status);
StructureNode->Structure = GetSmbiosBufferFromHandle (
StructureNode->SmbiosHandle,
StructureNode->SmbiosType,
NULL
);
GetSmbiosStructureSize (
StructureNode->Structure,
&StructureNode->StructureSize,
&CountOfString
);
return ;
}
/** /**
Fill a standard Smbios string field. Fill a standard Smbios string field.

42
EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/MiscConv.c
View File

@ -2391,30 +2391,28 @@ SmbiosFldMiscTypeOEM (
ASSERT_EFI_ERROR (Status); ASSERT_EFI_ERROR (Status);
if (StructureSize < RecordDataSize) { if (StructureSize < RecordDataSize) {
Status = SmbiosEnlargeStructureBuffer ( //
StructureNode, // Create new SMBIOS table entry
((EFI_SMBIOS_TABLE_HEADER *)RecordData)->Length, //
StructureSize, SmbiosUpdateStructureBuffer (
RecordDataSize StructureNode,
); RecordData
if (EFI_ERROR (Status)) { );
return Status; } else {
} //
// Copy the entire data (including the Smbios structure header),
// but preserve the handle that is already allocated.
//
Handle = StructureNode->Structure->Handle;
CopyMem (
StructureNode->Structure,
RecordData,
RecordDataSize
);
StructureNode->Structure->Handle = Handle;
StructureNode->StructureSize = RecordDataSize;
} }
//
// Copy the entire data (including the Smbios structure header),
// but preserve the handle that is already allocated.
//
Handle = StructureNode->Structure->Handle;
CopyMem (
StructureNode->Structure,
RecordData,
RecordDataSize
);
StructureNode->Structure->Handle = Handle;
StructureNode->StructureSize = RecordDataSize;
if (NewRecordData != NULL) { if (NewRecordData != NULL) {
FreePool (NewRecordData); FreePool (NewRecordData);
} }

14
EdkCompatibilityPkg/Compatibility/PiSmbiosRecordOnDataHubSmbiosRecordThunk/Thunk.h
View File

@ -264,6 +264,20 @@ SmbiosEnlargeStructureBuffer (
UINTN NewBufferSize UINTN NewBufferSize
); );
/**
Update the structure buffer of a structure node in SMBIOS database.
The function lead the structure pointer for SMBIOS record changed.
@param StructureNode The structure node whose structure buffer is to be enlarged.
@param NewRecord The new SMBIOS record.
**/
VOID
SmbiosUpdateStructureBuffer (
IN OUT SMBIOS_STRUCTURE_NODE *StructureNode,
IN EFI_SMBIOS_TABLE_HEADER *NewRecord
);
/** /**
Fill a standard Smbios string field. Fill a standard Smbios string field.