fix: return error on missing ITS with gicv3

Manciukic · JackThomson2 · commit 126efa8bd0a2 · 2026-01-26T13:49:54.000Z
The fuzzer found a crash when Gicv3 is used but its is None. Do not
unwrap but return an Err.

Signed-off-by: Riccardo Mancini &lt;mancio@amazon.com&gt;
diff --git a/src/vmm/src/arch/aarch64/gic/gicv3/regs/mod.rs b/src/vmm/src/arch/aarch64/gic/gicv3/regs/mod.rs
@@ -57,9 +57,11 @@ pub fn restore_state(
         icc_regs::set_icc_regs(gic_device, *mpidr, &vcpu_state.icc)?;
     }
 
-    // Safe to unwrap here, as we know we support an ITS device, so `its_state.is_some()` is always
-    // `true`.
-    state.its_state.as_ref().unwrap().restore(its_device)
+    state
+        .its_state
+        .as_ref()
+        .ok_or(GicError::MissingItsState)?
+        .restore(its_device)
 }
 
 #[cfg(test)]
diff --git a/src/vmm/src/arch/aarch64/gic/mod.rs b/src/vmm/src/arch/aarch64/gic/mod.rs
@@ -58,6 +58,8 @@ pub enum GicError {
     InconsistentVcpuCount,
     /// The VgicSysRegsState is invalid.
     InvalidVgicSysRegState,
+    /// ITS state is missing.
+    MissingItsState,
 }
 
 /// List of implemented GICs.

Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,11 @@ pub fn restore_state(`
`57`	`57`	`icc_regs::set_icc_regs(gic_device, *mpidr, &vcpu_state.icc)?;`
`58`	`58`	`}`
`59`	`59`
`60`		- // Safe to unwrap here, as we know we support an ITS device, so `its_state.is_some()` is always
`61`		- // `true`.
`62`		`- state.its_state.as_ref().unwrap().restore(its_device)`
	`60`	`+ state`
	`61`	`+ .its_state`
	`62`	`+ .as_ref()`
	`63`	`+ .ok_or(GicError::MissingItsState)?`
	`64`	`+ .restore(its_device)`
`63`	`65`	`}`
`64`	`66`
`65`	`67`	`#[cfg(test)]`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,8 @@ pub enum GicError {`
`58`	`58`	`InconsistentVcpuCount,`
`59`	`59`	`/// The VgicSysRegsState is invalid.`
`60`	`60`	`InvalidVgicSysRegState,`
	`61`	`+ /// ITS state is missing.`
	`62`	`+ MissingItsState,`
`61`	`63`	`}`
`62`	`64`
`63`	`65`	`/// List of implemented GICs.`