Branch: refs/heads/master
Home: https://github.com/tianocore/edk2
Commit: 19f7c63ea978c5a4ef9345b9bf4995dcd48fa328
https://github.com/tianocore/edk2/commit/19f7c63ea978c5a4ef9345b9bf4995dcd48fa328
Author: Min M Xu <[email protected]>
Date: 2022-12-15 (Thu, 15 Dec 2022)
Changed paths:
M OvmfPkg/IntelTdx/TdTcg2Dxe/TdTcg2Dxe.c
Log Message:
-----------
OvmfPkg/TdTcg2Dxe: Fix incorrect protocol and structure version
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4184
According to the Uefi spec 2.10 Section 38.2.2.
EFI_CC_MEASUREMENT_PROTOCOL.GetCapability, the minor version of
StructureVersion and ProtocolVersion should be 0.
Cc: Erdem Aktas <[email protected]> [ruleof2]
Cc: James Bottomley <[email protected]> [jejb]
Cc: Jiewen Yao <[email protected]> [jyao1]
Cc: Tom Lendacky <[email protected]> [tlendacky]
Cc: Arti Gupta <[email protected]>
Reported-by: Arti Gupta <[email protected]>
Signed-off-by: Min Xu <[email protected]>
Reviewed-by: Jiewen Yao <[email protected]>
Commit: fb91d6cbd0cff704586c4cadbef870acef9c52ef
https://github.com/tianocore/edk2/commit/fb91d6cbd0cff704586c4cadbef870acef9c52ef
Author: Min M Xu <[email protected]>
Date: 2022-12-15 (Thu, 15 Dec 2022)
Changed paths:
M OvmfPkg/IntelTdx/TdTcg2Dxe/TdTcg2Dxe.c
Log Message:
-----------
OvmfPkg/TdTcg2Dxe: Fix the mapping error between PCR index and MR index
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4179
According to UEFI Spec 2.10 it is supposed to return the mapping from PCR
index to CC MR index:
//
// In the current version, we use the below mapping for TDX:
//
// TPM PCR Index | CC Measurement Register Index | TDX-measurement register
// -----------------------------------------------------------------------
// 0 | 0 | MRTD
// 1, 7 | 1 | RTMR[0]
// 2~6 | 2 | RTMR[1]
// 8~15 | 3 | RTMR[2]
In the current implementation TdMapPcrToMrIndex returns the index of RTMR,
not the MR index.
After fix the spec unconsistent, other related codes are updated
accordingly.
1) The index of event log uses the input MrIndex.
2) MrIndex is decreated by 1 before it is sent for RTMR extending.
Cc: Erdem Aktas <[email protected]> [ruleof2]
Cc: James Bottomley <[email protected]> [jejb]
Cc: Jiewen Yao <[email protected]> [jyao1]
Cc: Tom Lendacky <[email protected]> [tlendacky]
Cc: Arti Gupta <[email protected]>
Reported-by: Arti Gupta <[email protected]>
Signed-off-by: Min Xu <[email protected]>
Reviewed-by: Jiewen Yao <[email protected]>
Commit: 01c0d3c0d508b8c1b41fd58e2ec565b40ea000ca
https://github.com/tianocore/edk2/commit/01c0d3c0d508b8c1b41fd58e2ec565b40ea000ca
Author: Min M Xu <[email protected]>
Date: 2022-12-15 (Thu, 15 Dec 2022)
Changed paths:
M SecurityPkg/Library/SecTpmMeasurementLib/SecTpmMeasurementLibTdx.c
Log Message:
-----------
OvmfPkg/SecTpmMeasurementLib: Fix the mapping error of PCR and RTMR index
BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4179
TDVF has the feature to do RTMR measurement in SEC phase. In the same time
it builds a GUID hob which carries the hash value of the measurement so
that in DXE phase a td event can be created based on this GUID Hob. There
is a mapping error between TPM PCR index and RTMR index according to UEFI
2.10. That PCR6 is missing in the mapping. This patch fixes this issue.
Cc: Erdem Aktas <[email protected]> [ruleof2]
Cc: James Bottomley <[email protected]> [jejb]
Cc: Jiewen Yao <[email protected]> [jyao1]
Cc: Tom Lendacky <[email protected]> [tlendacky]
Cc: Arti Gupta <[email protected]>
Signed-off-by: Min Xu <[email protected]>
Reviewed-by: Jiewen Yao <[email protected]>
Compare: https://github.com/tianocore/edk2/compare/44fc90eb0ea7...01c0d3c0d508
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
