Skip to content
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.

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

Fix UEFI Variable Fetching on Linux #655

Merged
merged 1 commit into from
Oct 18, 2024
Merged
Changes from all commits
Commits
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
10 changes: 9 additions & 1 deletion edk2toollib/os/uefivariablesupport.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,15 @@ def GetUefiVar(self, name: str, guid: str) -> tuple[int, str]:
efi_var = fd.read()
length = len(efi_var)

return (err, efi_var[:length])
# Unpack a uint32 from the start of efi_var, which is the attributes
# we always expect the attributes to be 7, since we are reading from runtime,
# report an error so the user knows it may fail to load if not 7
(attrs,) = struct.unpack("=I", efi_var[:4])
if attrs != 7:
logging.error(f"Unexpected attributes value: {attrs} for {name}-{guid}")
efi_var = efi_var[4:length]

return (err, efi_var)

def GetUefiAllVarNames(self) -> tuple[int, bytes]:
"""Get all Uefi Variables in the system, and return a byte packed byte string.
Expand Down