Skip to content

igvm: pad with zero byte instead of zero ascii #59

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

igvm: pad with zero byte instead of zero ascii #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/igvm/igvmfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ def update_crc32_checksum(self):
# IGVM parser assumes the header is aligned by 8
aligned_size = ((size + 7) >> 3) << 3
out.extend(bytes(h))
out.extend(b'0'*(aligned_size-size))
out.extend(b'\x00'*(aligned_size-size))

self.headers[0].Checksum = zlib.crc32(out)

Expand All @@ -400,7 +400,7 @@ def marshal(self) -> bytes:
#IGVM parser assumes the header is aligned by 8
aligned_size = ((size + 7) >> 3) << 3
out.extend(bytes(h))
out.extend(b'0'*(aligned_size-size))
out.extend(b'\x00'*(aligned_size-size))
return out

@staticmethod
Expand Down
2 changes: 1 addition & 1 deletion test/tests/test_bzImage.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ Magic:0x4d564749 FormatVersion:0x1 VariableHeaderOffset:0x18 VariableHeaderSize:0x1580 TotalFileSize:0x27598 Checksum:0x4db92e6 }
{ Magic:0x4d564749 FormatVersion:0x1 VariableHeaderOffset:0x18 VariableHeaderSize:0x1580 TotalFileSize:0x27598 Checksum:0xde9f0660 }
IGVM_VHT_SUPPORTED_PLATFORM(18){ CompatibilityMask:0x1 HighestVtl:0x2 PlatformType:0x2 PlatformVersion:0x1 SharedGPABoundary:0x0 }
IGVM_VHT_SNP_POLICY(30){ Policy:0x3001f CompatibilityMask:0x1 Reserved:0x0 }
IGVM_VHT_PAGE_DATA(48){ GPA:0xa0000 CompatibilityMask:0x1 FileOffset:0x0 Flags:0x0 DataType:0x0 Reserved:0x0 }
Expand Down
2 changes: 1 addition & 1 deletion test/tests/test_bzImage2.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ Magic:0x4d564749 FormatVersion:0x1 VariableHeaderOffset:0x18 VariableHeaderSize:0x31a0 TotalFileSize:0x2b1b8 Checksum:0xcbbb2145 }
{ Magic:0x4d564749 FormatVersion:0x1 VariableHeaderOffset:0x18 VariableHeaderSize:0x31a0 TotalFileSize:0x2b1b8 Checksum:0xf2dfc118 }
IGVM_VHT_SUPPORTED_PLATFORM(18){ CompatibilityMask:0x1 HighestVtl:0x2 PlatformType:0x2 PlatformVersion:0x1 SharedGPABoundary:0x0 }
IGVM_VHT_SNP_POLICY(30){ Policy:0x3001f CompatibilityMask:0x1 Reserved:0x0 }
IGVM_VHT_PAGE_DATA(48){ GPA:0xa0000 CompatibilityMask:0x1 FileOffset:0x0 Flags:0x0 DataType:0x0 Reserved:0x0 }
Expand Down
2 changes: 1 addition & 1 deletion test/tests/test_bzImage_noopt.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ Magic:0x4d564749 FormatVersion:0x1 VariableHeaderOffset:0x18 VariableHeaderSize:0x375e0 TotalFileSize:0x5d5f8 Checksum:0x1e537ad }
{ Magic:0x4d564749 FormatVersion:0x1 VariableHeaderOffset:0x18 VariableHeaderSize:0x375e0 TotalFileSize:0x5d5f8 Checksum:0x43a7d9c9 }
IGVM_VHT_SUPPORTED_PLATFORM(18){ CompatibilityMask:0x1 HighestVtl:0x2 PlatformType:0x2 PlatformVersion:0x1 SharedGPABoundary:0x0 }
IGVM_VHT_SNP_POLICY(30){ Policy:0x3001f CompatibilityMask:0x1 Reserved:0x0 }
IGVM_VHT_PAGE_DATA(48){ GPA:0x0 CompatibilityMask:0x1 FileOffset:0x0 Flags:0x0 DataType:0x0 Reserved:0x0 }
Expand Down
2 changes: 1 addition & 1 deletion test/tests/test_bzImage_x64.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ Magic:0x4d564749 FormatVersion:0x1 VariableHeaderOffset:0x18 VariableHeaderSize:0x31c0 TotalFileSize:0x2c1d8 Checksum:0xf74ad757 }
{ Magic:0x4d564749 FormatVersion:0x1 VariableHeaderOffset:0x18 VariableHeaderSize:0x31c0 TotalFileSize:0x2c1d8 Checksum:0x7ffff34c }
IGVM_VHT_SUPPORTED_PLATFORM(18){ CompatibilityMask:0x1 HighestVtl:0x2 PlatformType:0x2 PlatformVersion:0x1 SharedGPABoundary:0x0 }
IGVM_VHT_SNP_POLICY(30){ Policy:0x3001f CompatibilityMask:0x1 Reserved:0x0 }
IGVM_VHT_PAGE_DATA(48){ GPA:0xa0000 CompatibilityMask:0x1 FileOffset:0x0 Flags:0x0 DataType:0x0 Reserved:0x0 }
Expand Down
2 changes: 1 addition & 1 deletion test/tests/test_elf.dump
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ Magic:0x4d564749 FormatVersion:0x1 VariableHeaderOffset:0x18 VariableHeaderSize:0x30a0 TotalFileSize:0x2c0b8 Checksum:0xefe2587d }
{ Magic:0x4d564749 FormatVersion:0x1 VariableHeaderOffset:0x18 VariableHeaderSize:0x30a0 TotalFileSize:0x2c0b8 Checksum:0x70c67e94 }
IGVM_VHT_SUPPORTED_PLATFORM(18){ CompatibilityMask:0x1 HighestVtl:0x2 PlatformType:0x2 PlatformVersion:0x1 SharedGPABoundary:0x0 }
IGVM_VHT_SNP_POLICY(30){ Policy:0x3001f CompatibilityMask:0x1 Reserved:0x0 }
IGVM_VHT_PAGE_DATA(48){ GPA:0xa0000 CompatibilityMask:0x1 FileOffset:0x0 Flags:0x0 DataType:0x0 Reserved:0x0 }
Expand Down