From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id D93731FF13E for ; Fri, 23 Jan 2026 16:43:44 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2E7101183C; Fri, 23 Jan 2026 16:44:05 +0100 (CET) From: Robert Obkircher To: pbs-devel@lists.proxmox.com Date: Fri, 23 Jan 2026 16:37:23 +0100 Message-ID: <20260123154147.222215-11-r.obkircher@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260123154147.222215-1-r.obkircher@proxmox.com> References: <20260123154147.222215-1-r.obkircher@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1769182952407 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.056 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH v4 proxmox-backup 10/11] datastore: compute fidx file size with overflow checks X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" 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 --- 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 { + 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::())) + .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::() + 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::() + 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