From: Robert Obkircher <r.obkircher@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH v4 proxmox-backup 10/11] datastore: compute fidx file size with overflow checks
Date: Fri, 23 Jan 2026 16:37:23 +0100 [thread overview]
Message-ID: <20260123154147.222215-11-r.obkircher@proxmox.com> (raw)
In-Reply-To: <20260123154147.222215-1-r.obkircher@proxmox.com>
This also serves as a preparation for mmapping the entire file to
support page sizes that are larger than the file header.
Signed-off-by: Robert Obkircher <r.obkircher@proxmox.com>
---
pbs-datastore/src/fixed_index.rs | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/pbs-datastore/src/fixed_index.rs b/pbs-datastore/src/fixed_index.rs
index c2888372..dbb24111 100644
--- a/pbs-datastore/src/fixed_index.rs
+++ b/pbs-datastore/src/fixed_index.rs
@@ -296,7 +296,8 @@ impl FixedIndexWriter {
};
let index_size = index_capacity * 32;
- nix::unistd::ftruncate(&file, (header_size + index_size) as i64)?;
+ let file_size = Self::file_size(index_capacity)?;
+ nix::unistd::ftruncate(&file, file_size)?;
let data = unsafe {
nix::sys::mman::mmap(
@@ -328,6 +329,22 @@ impl FixedIndexWriter {
})
}
+ /// Computes the size of a fidx file containing `index_length`
+ /// chunk digests.
+ ///
+ /// Guarantees that the size fits into usize, isize and i64.
+ fn file_size(index_length: usize) -> Result<i64, Error> {
+ if index_length == 0 {
+ bail!("fidx file must have at least one chunk");
+ }
+ index_length
+ .checked_mul(32)
+ .and_then(|s| s.checked_add(size_of::<FixedIndexHeader>()))
+ .filter(|s| *s <= isize::MAX as usize)
+ .and_then(|s| i64::try_from(s).ok())
+ .ok_or_else(|| format_err!("fidx file size overflow for {index_length} chunks"))
+ }
+
/// If this returns an error, the sizes may be out of sync,
/// which is especially bad if the capacity was reduced.
fn set_index_capacity(&mut self, new_capacity: usize) -> Result<(), Error> {
@@ -336,7 +353,7 @@ impl FixedIndexWriter {
}
let old_index_size = self.index_capacity * 32;
let new_index_size = new_capacity * 32;
- let new_file_size = (size_of::<FixedIndexHeader>() + new_index_size) as i64;
+ let new_file_size = Self::file_size(new_capacity)?;
let index_addr = NonNull::new(self.index as *mut std::ffi::c_void).ok_or_else(|| {
format_err!("Can't resize FixedIndexWriter index because the index pointer is null.")
@@ -439,11 +456,9 @@ impl FixedIndexWriter {
self.unmap()?;
- if self.index_length == 0 {
- bail!("refusing to close empty fidx file {:?}", self.tmp_filename);
- } else if self.index_length < self.index_capacity {
- let file_size = size_of::<FixedIndexHeader>() + index_size;
- nix::unistd::ftruncate(&self.file, file_size as i64)?;
+ if self.index_length < self.index_capacity {
+ let file_size = Self::file_size(self.index_length)?;
+ nix::unistd::ftruncate(&self.file, file_size)?;
self.index_capacity = self.index_length;
}
--
2.47.3
_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next prev parent reply other threads:[~2026-01-23 15:43 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-23 15:37 [pbs-devel] [PATCH v4 proxmox-backup 00/11] fix: #3847 pipe from STDIN to proxmox-backup-client Robert Obkircher
2026-01-23 15:37 ` [pbs-devel] [PATCH v4 proxmox-backup 01/11] datastore: support writing fidx files of unknown size Robert Obkircher
2026-01-23 15:37 ` [pbs-devel] [PATCH v4 proxmox-backup 02/11] datastore: remove Arc<ChunkStore> from FixedIndexWriter Robert Obkircher
2026-01-23 15:37 ` [pbs-devel] [PATCH v4 proxmox-backup 03/11] datastore: test FixedIndexWriter Robert Obkircher
2026-01-23 15:37 ` [pbs-devel] [PATCH v4 proxmox-backup 04/11] api: backup: make fixed index file size optional Robert Obkircher
2026-01-23 15:37 ` [pbs-devel] [PATCH v4 proxmox-backup 05/11] api: verify fixed index writer size on close Robert Obkircher
2026-01-23 15:37 ` [pbs-devel] [PATCH v4 proxmox-backup 06/11] fix #3847: client: support fifo pipe inputs for images Robert Obkircher
2026-01-23 15:37 ` [pbs-devel] [PATCH v4 proxmox-backup 07/11] client: treat minus sign as stdin Robert Obkircher
2026-01-23 15:37 ` [pbs-devel] [PATCH v4 proxmox-backup 08/11] datastore: combine public FixedIndexWriter methods into add_chunk Robert Obkircher
2026-01-23 15:37 ` [pbs-devel] [PATCH v4 proxmox-backup 09/11] datastore: use u64 instead of usize for fidx writer content size Robert Obkircher
2026-01-23 15:37 ` Robert Obkircher [this message]
2026-01-23 15:37 ` [pbs-devel] [PATCH v4 proxmox-backup 11/11] datastore: support writing fidx files on systems with larger page size Robert Obkircher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260123154147.222215-11-r.obkircher@proxmox.com \
--to=r.obkircher@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.