From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 8DFD7650E5 for ; Mon, 2 Nov 2020 12:35:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5F353228A6 for ; Mon, 2 Nov 2020 12:34:42 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9715B22885 for ; Mon, 2 Nov 2020 12:34:40 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5C6D445FFE for ; Mon, 2 Nov 2020 12:34:40 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Mon, 2 Nov 2020 12:34:36 +0100 Message-Id: <20201102113439.26618-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201102113439.26618-1-d.csapak@proxmox.com> References: <20201102113439.26618-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.421 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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 proxmox-backup 2/5] backup/{dynamic, fixed}_index: improve error message for small index files 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: , X-List-Received-Date: Mon, 02 Nov 2020 11:35:12 -0000 index files that were smaller than their respective header size, would fail with "failed to fill whole buffer" instead now check explicitely for the size and fail with "index too small (size)" Signed-off-by: Dominik Csapak --- src/backup/dynamic_index.rs | 20 +++++++++++++------- src/backup/fixed_index.rs | 19 +++++++++++++------ 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/src/backup/dynamic_index.rs b/src/backup/dynamic_index.rs index 8731a418..08f9cdff 100644 --- a/src/backup/dynamic_index.rs +++ b/src/backup/dynamic_index.rs @@ -95,6 +95,18 @@ impl DynamicIndexReader { let header_size = std::mem::size_of::(); + let rawfd = file.as_raw_fd(); + let stat = match nix::sys::stat::fstat(rawfd) { + Ok(stat) => stat, + Err(err) => bail!("fstat failed - {}", err), + }; + + let size = stat.st_size as usize; + + if size < header_size { + bail!("index too small ({})", stat.st_size); + } + let header: Box = unsafe { file.read_host_value_boxed()? }; if header.magic != super::DYNAMIC_SIZED_CHUNK_INDEX_1_0 { @@ -103,13 +115,7 @@ impl DynamicIndexReader { let ctime = proxmox::tools::time::epoch_i64(); - let rawfd = file.as_raw_fd(); - - let stat = nix::sys::stat::fstat(rawfd)?; - - let size = stat.st_size as usize; - - let index_size = size - header_size; + let index_size = stat.st_size as usize - header_size; let index_count = index_size / 40; if index_count * 40 != index_size { bail!("got unexpected file size"); diff --git a/src/backup/fixed_index.rs b/src/backup/fixed_index.rs index eff50055..44ebfabe 100644 --- a/src/backup/fixed_index.rs +++ b/src/backup/fixed_index.rs @@ -68,6 +68,19 @@ impl FixedIndexReader { file.seek(SeekFrom::Start(0))?; let header_size = std::mem::size_of::(); + + let rawfd = file.as_raw_fd(); + let stat = match nix::sys::stat::fstat(rawfd) { + Ok(stat) => stat, + Err(err) => bail!("fstat failed - {}", err), + }; + + let size = stat.st_size as usize; + + if size < header_size { + bail!("index too small ({})", stat.st_size); + } + let header: Box = unsafe { file.read_host_value_boxed()? }; if header.magic != super::FIXED_SIZED_CHUNK_INDEX_1_0 { @@ -81,12 +94,6 @@ impl FixedIndexReader { let index_length = ((size + chunk_size - 1) / chunk_size) as usize; let index_size = index_length * 32; - let rawfd = file.as_raw_fd(); - - let stat = match nix::sys::stat::fstat(rawfd) { - Ok(stat) => stat, - Err(err) => bail!("fstat failed - {}", err), - }; let expected_index_size = (stat.st_size as usize) - header_size; if index_size != expected_index_size { -- 2.20.1