rust: add bound check for imr_index when replay (#108)

cc-api · Mar 4, 2024 · d621bd7 · d621bd7
1 parent af1cb86
commit d621bd7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/common/rust/cctrusted_base/src/eventlog.rs b/common/rust/cctrusted_base/src/eventlog.rs
@@ -509,7 +509,10 @@ impl EventLogs {
  1: { 12: <measurement_replayed>},
  ]
  */
- pub fn replay(eventlogs: Vec<EventLogEntry>) -> Result<Vec<ReplayResult>, anyhow::Error> {
+ pub fn replay(
+ eventlogs: Vec<EventLogEntry>,
+ imr_idx_max: u32,
+ ) -> Result<Vec<ReplayResult>, anyhow::Error> {
  let mut replay_results: Vec<ReplayResult> = Vec::new();
 
  for event_log in eventlogs {
@@ -519,6 +522,9 @@ impl EventLogs {
  continue;
  }
  let imr_index = tcg_imr_event.imr_index;
+ if imr_index > imr_idx_max {
+ return Err(anyhow!("imr_index {} out of range", imr_index));
+ }
  for digest in tcg_imr_event.digests {
  let algo_id = digest.algo_id;
  let hash = digest.hash;

diff --git a/vmsdk/rust/cctrusted_vm/src/tdvm.rs b/vmsdk/rust/cctrusted_vm/src/tdvm.rs
@@ -469,7 +469,7 @@ impl CVM for TdxVM {
  &self,
  eventlogs: Vec<EventLogEntry>,
  ) -> Result<Vec<ReplayResult>, anyhow::Error> {
- EventLogs::replay(eventlogs)
+ EventLogs::replay(eventlogs, TdxRTMR::max_index().into())
  }
 
  // CVM trait function: retrive CVM type