[pbs-devel] [PATCH v2 proxmox-backup 2/2] datastore: prevent potentially unaligned FixedIndexHeader reference
Robert Obkircher
r.obkircher at proxmox.com
Tue Dec 30 13:39:49 CET 2025
Continue to avoid the 4 KiB stack allocation in debug builds by
adopting the approach used for the DynamicIndexHeader.
This also avoid mutation through Vec::as_ptr, which is forbidden
according to its documentation.
Signed-off-by: Robert Obkircher <r.obkircher at proxmox.com>
---
pbs-datastore/src/fixed_index.rs | 35 ++++++++++++++++++++++++--------
1 file changed, 27 insertions(+), 8 deletions(-)
diff --git a/pbs-datastore/src/fixed_index.rs b/pbs-datastore/src/fixed_index.rs
index 6c3be2d4..7241d77f 100644
--- a/pbs-datastore/src/fixed_index.rs
+++ b/pbs-datastore/src/fixed_index.rs
@@ -29,6 +29,31 @@ pub struct FixedIndexHeader {
}
proxmox_lang::static_assert_size!(FixedIndexHeader, 4096);
+impl FixedIndexHeader {
+ /// Convenience method to allocate a zero-initialized header struct.
+ pub fn zeroed() -> Box<Self> {
+ let layout = std::alloc::Layout::new::<Self>();
+ unsafe {
+ let ptr = std::alloc::alloc_zeroed(layout) as *mut Self;
+ if ptr.is_null() {
+ std::alloc::handle_alloc_error(layout);
+ }
+ Box::from_raw(ptr)
+ }
+ }
+
+ pub fn as_bytes(&self) -> &[u8] {
+ unsafe {
+ // There can't be any uninitialized padding, because the fields
+ // take up all of the statically asserted total size.
+ std::slice::from_raw_parts(
+ self as *const Self as *const u8,
+ std::mem::size_of::<Self>(),
+ )
+ }
+ }
+}
+
// split image into fixed size chunks
pub struct FixedIndexReader {
@@ -237,7 +262,6 @@ impl Drop for FixedIndexWriter {
}
impl FixedIndexWriter {
- #[allow(clippy::cast_ptr_alignment)]
// Requires obtaining a shared chunk store lock beforehand
pub fn create(
store: Arc<ChunkStore>,
@@ -267,18 +291,13 @@ impl FixedIndexWriter {
let uuid = Uuid::generate();
- let buffer = vec![0u8; header_size];
- let header = unsafe { &mut *(buffer.as_ptr() as *mut FixedIndexHeader) };
-
+ let mut header = FixedIndexHeader::zeroed();
header.magic = file_formats::FIXED_SIZED_CHUNK_INDEX_1_0;
header.ctime = i64::to_le(ctime);
header.size = u64::to_le(size as u64);
header.chunk_size = u64::to_le(chunk_size as u64);
header.uuid = *uuid.as_bytes();
-
- header.index_csum = [0u8; 32];
-
- file.write_all(&buffer)?;
+ file.write_all(header.as_bytes())?;
let index_length = size.div_ceil(chunk_size);
let index_size = index_length * 32;
--
2.47.3
More information about the pbs-devel
mailing list