Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[TieredStorage] Boundary check for accessing hot account meta #34349

Merged
merged 7 commits into from
Dec 18, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 40 additions & 4 deletions accounts-db/src/tiered_storage/hot.rs
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,16 @@ impl HotStorageReader {
&self,
account_offset: HotAccountOffset,
) -> TieredStorageResult<&HotAccountMeta> {
let internal_account_offset = account_offset.offset();

let (meta, _) = get_pod::<HotAccountMeta>(&self.mmap, internal_account_offset)?;
let offset = account_offset.offset();

assert!(
offset.saturating_add(std::mem::size_of::<HotAccountMeta>())
<= self.footer.index_block_offset as usize,
"reading HotAccountOffset ({}) would exceed accounts blocks offset boundary ({}).",
offset,
self.footer.index_block_offset,
);
let (meta, _) = get_pod::<HotAccountMeta>(&self.mmap, offset)?;
Ok(meta)
}

Expand Down Expand Up @@ -538,7 +545,7 @@ pub mod tests {
.collect();

let account_offsets: Vec<_>;
let footer = TieredStorageFooter {
let mut footer = TieredStorageFooter {
account_meta_format: AccountMetaFormat::Hot,
account_entry_count: NUM_ACCOUNTS,
..TieredStorageFooter::default()
Expand All @@ -557,6 +564,7 @@ pub mod tests {
.collect();
// while the test only focuses on account metas, writing a footer
// here is necessary to make it a valid tiered-storage file.
footer.index_block_offset = current_offset as u64;
footer.write_footer_block(&file).unwrap();
}

Expand All @@ -566,9 +574,37 @@ pub mod tests {
let meta = hot_storage.get_account_meta_from_offset(*offset).unwrap();
assert_eq!(meta, expected_meta);
}

assert_eq!(&footer, hot_storage.footer());
}

#[test]
#[should_panic(expected = "would exceed accounts blocks offset boundary")]
fn test_get_acount_meta_from_offset_out_of_bounds() {
yhchiang-sol marked this conversation as resolved.
Show resolved Hide resolved
// Generate a new temp path that is guaranteed to NOT already have a file.
let temp_dir = TempDir::new().unwrap();
let path = temp_dir
.path()
.join("test_get_acount_meta_from_offset_out_of_bounds");

let footer = TieredStorageFooter {
account_meta_format: AccountMetaFormat::Hot,
index_block_offset: 160,
..TieredStorageFooter::default()
};

{
let file = TieredStorageFile::new_writable(&path).unwrap();
footer.write_footer_block(&file).unwrap();
}

let hot_storage = HotStorageReader::new_from_path(&path).unwrap();
let offset = HotAccountOffset::new(footer.index_block_offset as usize).unwrap();
// Read from index_block_offset, which offset doesn't belong to
// account blocks. Expect assert failure here
hot_storage.get_account_meta_from_offset(offset).unwrap();
}

#[test]
fn test_hot_storage_get_account_offset_and_address() {
// Generate a new temp path that is guaranteed to NOT already have a file.
Expand Down