pr: sanitize the footer version

solana-labs · Nov 30, 2023 · 251e28b · 251e28b
1 parent 1b21e61
commit 251e28b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/accounts-db/src/tiered_storage/error.rs b/accounts-db/src/tiered_storage/error.rs
@@ -20,6 +20,9 @@ pub enum TieredStorageError {
     #[error("invalid footer size: {0}, expected: {1}")]
     InvalidFooterSize(u64, u64),
 
+    #[error("invalid footer version: {0}")]
+    InvalidFooterVersion(u64),
+
     #[error("footer is unsanitary: {0}")]
     SanitizeFooter(#[from] SanitizeFooterError),
 }
diff --git a/accounts-db/src/tiered_storage/footer.rs b/accounts-db/src/tiered_storage/footer.rs
@@ -219,8 +219,12 @@ impl TieredStorageFooter {
         }
 
         let mut footer_version: u64 = 0;
-        let mut magic_number = TieredStorageMagicNumber::zeroed();
         file.read_type(&mut footer_version)?;
+        if footer_version != FOOTER_FORMAT_VERSION {
+            return Err(TieredStorageError::InvalidFooterVersion(footer_version));
+        }
+
+        let mut magic_number = TieredStorageMagicNumber::zeroed();
         file.read_type(&mut magic_number)?;
         if magic_number != TieredStorageMagicNumber::default() {
             return Err(TieredStorageError::MagicNumberMismatch(
@@ -247,9 +251,12 @@ impl TieredStorageFooter {
             ));
         }
 
-        let (_footer_version, offset) = get_type::<u64>(mmap, offset)?;
-        let (magic_number, _offset) = get_type::<TieredStorageMagicNumber>(mmap, offset)?;
+        let (footer_version, offset) = get_type::<u64>(mmap, offset)?;
+        if *footer_version != FOOTER_FORMAT_VERSION {
+            return Err(TieredStorageError::InvalidFooterVersion(*footer_version));
+        }
 
+        let (magic_number, _offset) = get_type::<TieredStorageMagicNumber>(mmap, offset)?;
         if *magic_number != TieredStorageMagicNumber::default() {
             return Err(TieredStorageError::MagicNumberMismatch(
                 TieredStorageMagicNumber::default().0,