Improve the method for getting Region 1~3 base and size #677
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
OuyangHang33
changed the title
|
Hi @arronwy , could you take a look and test it? Thank you! |
jyao1
reviewed
Mar 25, 2024
| // Cert table Offset: 128/144 Size: 8 | ||
|
|
||
| let magic = ((buf[optional_header_addr + 1] as u16) << 8) | buf[optional_header_addr] as u16; | ||
| let is_pe32 = is_pe32(magic).ok().unwrap(); |
jyao1
reviewed
Mar 25, 2024
| let is_pe32 = is_pe32(magic).ok().unwrap(); | ||
| let optional_size_of_headers_offset: usize = 0x003c; | ||
| let optional_checksum_offset: usize = 0x0040; | ||
| let optional_cert_table_offset = if is_pe32 { 0x0080 } else { 0x0090 }; |
There was a problem hiding this comment.
How do we support PE32 (IA32), not PE32+ (X64)?
There was a problem hiding this comment.
Only support PE32+, removed magic check
OuyangHang33
changed the title
Signed-off-by: OuyangHang33 <[email protected]>
arronwy
approved these changes
Mar 25, 2024
There was a problem hiding this comment.
Thanks @OuyangHang33 LGTM!
Verified with guest 6.6 kernel and 6.8 kernel:
file /root/tdx_vm/bzImage
/root/tdx_vm/bzImage: Linux kernel x86 boot executable bzImage, version 6.8.0-rc5-g1470fd2f6d23-dirty (root@tdx-ac2) #11 SMP PREEMPT_DYNAMIC Wed Mar 20 06:56:33 UTC 2024, RO-rootFS, swap_dev 0X11, Normal VGA
target/release/td-payload-reference-calculator kernel -q --kernel /root/tdx_vm/bzImage
6ad357abcad6dd3c91cda809428937bb5915b48f71c961c603c78652c35452dc1286430fa59a54e47841a1ce1b9c5028
Event Entry:
RTMR: 2
Event Type: EV_EFI_BOOT_SERVICES_APPLICATION
Digest Algorithm: TPM_ALG_SHA384
Digest: 6ad357abcad6dd3c91cda809428937bb5915b48f71c961c603c78652c35452dc1286430fa59a54e47841a1ce1b9c5028
Event Desc: 1840cd790000000000421d010000000000000000000000002a000000000000000403140072f728144ab61e44b8c39ebdd7f893c7040412006b00650072006e0065006c0000007fff0400
file /root/tdx_vm/bzImage_6.6
/root/tdx_vm/bzImage_6.6: Linux kernel x86 boot executable bzImage, version 6.6.0-rc2-gc177cc781327 (root@tdx-ac2) #1 SMP PREEMPT_DYNAMIC Thu Mar 7 03:35:48 UTC 2024, RO-rootFS, swap_dev 0X11, Normal VGA
target/release/td-payload-reference-calculator kernel -q --kernel /root/tdx_vm/bzImage_6.6
ddb0ae763ef79685a2102128325e6a7f765ef3b602ad22c12e13b97d6f1e44d1dbb4e55fef418003ad37125a14a67a65
Event Entry:
RTMR: 2
Event Type: EV_EFI_BOOT_SERVICES_APPLICATION
Digest Algorithm: TPM_ALG_SHA384
Digest: ddb0ae763ef79685a2102128325e6a7f765ef3b602ad22c12e13b97d6f1e44d1dbb4e55fef418003ad37125a14a67a65
Event Desc: 18e0db790000000080f315010000000000000001000000002a000000000000000403140072f728144ab61e44b8c39ebdd7f893c7040412006b00650072006e0065006c0000007fff0400
jyao1
approved these changes
May 7, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix: #676
Tested with bzImage6.8 and get:
6ad357abcad6dd3c91cda809428937bb5915b48f71c961c603c78652c35452dc1286430fa59a54e47841a1ce1b9c5028
Match with:
Digest: 6ad357abcad6dd3c91cda809428937bb5915b48f71c961c603c78652c35452dc1286430fa59a54e47841a1ce1b9c5028