Skip to content

OcMainLib: treat empty Generic->SystemUUID like "OEM" #620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
albert-mueller wants to merge 2 commits into from
Closed

OcMainLib: treat empty Generic->SystemUUID like "OEM" #620

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d6a9e9
OcMainLib: treat empty Generic->SystemUUID like "OEM"
albert-mueller Aug 26, 2026
8e9ff32
Removing AI generated comments that add to clutter in the code
albert-mueller Aug 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 33 additions & 2 deletions Library/OcMainLib/OpenCorePlatform.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,37 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

STATIC CHAR8 mCurrentSmbiosProductName[OC_OEM_NAME_MAX];

/**
Determine whether an ASCII PlatformInfo->Generic->SystemUUID value should
be treated as OEM, i.e. extracted from the real, unspoofed SMBIOS table
instead of parsed as a user-specified UUID.

Per Configuration.pdf and OcValidateLib (see ValidatePlatformInfo.c), an
empty PlatformInfo->Generic->SystemUUID is documented as a legal value
equivalent to explicitly specifying "OEM". Previously only the literal
"OEM" string was recognised at the two call sites below, so leaving
SystemUUID empty silently fell through to OcAsciiStrToRawGuid() on an
empty string. That call fails and its status is not checked, so
MacInfo->Oem.SystemUuid was left zeroed by GetMacInfo(). A zero UUID is
skipped when populating the Data Hub entry (OcPlatformUpdateDataHub) and
the "system-id" NVRAM variable (OcPlatformUpdateNvram/
OcGetLegacySecureBootECID), but is NOT skipped by the SMBIOS UUID
override, which falls back to the real hardware UUID from the original
SMBIOS table instead of leaving it zero (see SMBIOS_OVERRIDE_V in
SmbiosPatch.c). This asymmetry allowed PlatformInfo->Generic (Data Hub/
NVRAM/IOPlatformUUID) and PlatformInfo->SMBIOS to end up exposing two
different UUIDs whenever SystemUUID was left empty for automatic
generation.
**/
STATIC
BOOLEAN
PlatformInfoUuidIsOem (
IN CONST CHAR8 *AsciiSystemUuid
)
{
return (AsciiSystemUuid[0] == '\0') || (AsciiStrCmp (AsciiSystemUuid, "OEM") == 0);
}

STATIC
VOID
OcPlatformUpdateDataHub (
Expand Down Expand Up @@ -774,7 +805,7 @@ OcLoadPlatformSupport (
GetMacInfo (OC_BLOB_GET (&Config->PlatformInfo.Generic.SystemProductName), &InfoData);
UsedMacInfo = &InfoData;
UseOemSerial = AsciiStrCmp (OC_BLOB_GET (&Config->PlatformInfo.Generic.SystemSerialNumber), "OEM") == 0;
UseOemUuid = AsciiStrCmp (OC_BLOB_GET (&Config->PlatformInfo.Generic.SystemUuid), "OEM") == 0;
UseOemUuid = PlatformInfoUuidIsOem (OC_BLOB_GET (&Config->PlatformInfo.Generic.SystemUuid));
UseOemMlb = AsciiStrCmp (OC_BLOB_GET (&Config->PlatformInfo.Generic.Mlb), "OEM") == 0;
UseOemRom = AsciiStrCmp ((CHAR8 *)Config->PlatformInfo.Generic.Rom, "OEM") == 0;
} else {
Expand Down Expand Up @@ -891,7 +922,7 @@ OcGetLegacySecureBootECID (
//
if (Config->PlatformInfo.UpdateNvram) {
if (Config->PlatformInfo.Automatic) {
if (AsciiStrCmp (OC_BLOB_GET (&Config->PlatformInfo.Generic.SystemUuid), "OEM") == 0) {
if (PlatformInfoUuidIsOem (OC_BLOB_GET (&Config->PlatformInfo.Generic.SystemUuid))) {
Status = OcSmbiosTablePrepare (&SmbiosTable);
if (!EFI_ERROR (Status)) {
OcSmbiosExtractOemInfo (
Expand Down
Loading