From ea91557ed06afd9043413c8881e5ac86384aed71 Mon Sep 17 00:00:00 2001 From: Paul Meyer Date: Thu, 13 Mar 2025 14:27:44 +0100 Subject: [PATCH] igvm: pad with zero byte instead of zero ascii Signed-off-by: Paul Meyer --- src/igvm/igvmfile.py | 4 ++-- test/tests/test_bzImage.dump | 2 +- test/tests/test_bzImage2.dump | 2 +- test/tests/test_bzImage_noopt.dump | 2 +- test/tests/test_bzImage_x64.dump | 2 +- test/tests/test_elf.dump | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/igvm/igvmfile.py b/src/igvm/igvmfile.py index d8e9403..31b41fe 100644 --- a/src/igvm/igvmfile.py +++ b/src/igvm/igvmfile.py @@ -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) @@ -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 diff --git a/test/tests/test_bzImage.dump b/test/tests/test_bzImage.dump index b5ab89c..8545941 100644 --- a/test/tests/test_bzImage.dump +++ b/test/tests/test_bzImage.dump @@ -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 } diff --git a/test/tests/test_bzImage2.dump b/test/tests/test_bzImage2.dump index 6f08a55..111ecf5 100644 --- a/test/tests/test_bzImage2.dump +++ b/test/tests/test_bzImage2.dump @@ -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 } diff --git a/test/tests/test_bzImage_noopt.dump b/test/tests/test_bzImage_noopt.dump index d9500bd..86d8477 100644 --- a/test/tests/test_bzImage_noopt.dump +++ b/test/tests/test_bzImage_noopt.dump @@ -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 } diff --git a/test/tests/test_bzImage_x64.dump b/test/tests/test_bzImage_x64.dump index 0299206..1d77f96 100644 --- a/test/tests/test_bzImage_x64.dump +++ b/test/tests/test_bzImage_x64.dump @@ -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 } diff --git a/test/tests/test_elf.dump b/test/tests/test_elf.dump index 0ad6204..bc06b1b 100644 --- a/test/tests/test_elf.dump +++ b/test/tests/test_elf.dump @@ -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 }