Skip to content

fix(migtd): verify info_hash instead of servtd_hash#902

Merged
jyao1 merged 1 commit into
intel:mainfrom
haitaohuang:upstream/pr_fix_hash
Jun 24, 2026
Merged

fix(migtd): verify info_hash instead of servtd_hash#902
jyao1 merged 1 commit into
intel:mainfrom
haitaohuang:upstream/pr_fix_hash

Conversation

@haitaohuang

Copy link
Copy Markdown
Contributor

The old verify_servtd_hash computed SHA384(info_hash || type || attr) and compared to init_servtd_hash. Per GHCI spec, the correct check is to compare SHA384(masked_tdinfo) directly against init_servtd_info_hash, removing the unnecessary extra hash layer.

Also renames verify_servtd_hash to verify_servtd_info_hash for clarity.

Co-developed-by: Copilot 223556219+Copilot@users.noreply.github.com

The old verify_servtd_hash computed SHA384(info_hash || type || attr) and
compared to init_servtd_hash. Per GHCI spec, the correct check is to
compare SHA384(masked_tdinfo) directly against init_servtd_info_hash,
removing the unnecessary extra hash layer.

Also renames verify_servtd_hash to verify_servtd_info_hash for clarity.

Co-developed-by: Copilot <223556219+Copilot@users.noreply.github.com>
Signed-off-by: Haitao Huang <haitaohuang@microsoft.com>
@haitaohuang haitaohuang requested review from jyao1 and sgrams as code owners June 18, 2026 01:11
@haitaohuang

Copy link
Copy Markdown
Contributor Author

@sgrams @jyao1 Could you review this? We tested with 1.33 module

@jyao1

jyao1 commented Jun 24, 2026

Copy link
Copy Markdown
Contributor

OK. It seems misunderstanding on SERVTD_HASH v.s. SERVTD_INFO_HASH.

SERVTD_HASH Calculation
Concatenate SERVTD_INFO_HASH, SERVTD_TYPE and SERVTD_ATTR of each slot in a temporary buffer:
 SERVTD_INFO_HASH in bytes 47:0
 SERVTD_TYPE in bytes 49:48
 SERVTD_ATTR in bytes 57:50

INIT_INFO_HASH contains the value of the Service TD binding entry’s INFO_HASH at TDH.MR.FINALIZE time.

I think we should use SERVTD_INFO_HASH to validate INIT_INFO_HASH.

@jyao1 jyao1 merged commit 41aae87 into intel:main Jun 24, 2026
61 checks passed
@haitaohuang haitaohuang deleted the upstream/pr_fix_hash branch June 25, 2026 19:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants