commit 74f7f4b29ba22e2fed6c9b34bd1abac6860e5cfb
author Alice Wang <aliceywang@google.com> Tue Jun 13 08:24:50 2023 +0000
committer Alice Wang <aliceywang@google.com> Tue Jun 13 11:55:26 2023 +0000
tree 0c79034f67ecd81b0d37cf4f5fa904b461fb99c9
parent ce7ed5e6851cfddd611da3c61981b3228ee96b3e

[rialto][fdt] Map and validate FDT range in memory before parsing

Bug: 284462758
Test: atest rialto_test
Change-Id: I50c081ad806a59da9a3965dd6787b9a1f0c9795e

rialto/src/error.rs

diff --git a/rialto/src/error.rs b/rialto/src/error.rs
index bf26639..8e2991c 100644
--- a/rialto/src/error.rs
+++ b/rialto/src/error.rs
@@ -19,6 +19,7 @@
 use fdtpci::PciError;
 use hyp::Error as HypervisorError;
 use libfdt::FdtError;
+use vmbase::memory::MemoryTrackerError;
 
 pub type Result<T> = result::Result<T, Error>;
 
@@ -34,6 +35,8 @@
     InvalidFdt(FdtError),
     /// Invalid PCI.
     InvalidPci(PciError),
+    /// Failed memory operation.
+    MemoryOperationFailed(MemoryTrackerError),
 }
 
 impl fmt::Display for Error {
@@ -46,6 +49,7 @@
             Self::LoggerInit => write!(f, "Failed to initialize the logger."),
             Self::InvalidFdt(e) => write!(f, "Invalid FDT: {e}"),
             Self::InvalidPci(e) => write!(f, "Invalid PCI: {e}"),
+            Self::MemoryOperationFailed(e) => write!(f, "Failed memory operation: {e}"),
         }
     }
 }
@@ -73,3 +77,9 @@
         Self::InvalidPci(e)
     }
 }
+
+impl From<MemoryTrackerError> for Error {
+    fn from(e: MemoryTrackerError) -> Self {
+        Self::MemoryOperationFailed(e)
+    }
+}