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 0108F7542F for ; Wed, 13 Oct 2021 10:25:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E53BFE5C4 for ; Wed, 13 Oct 2021 10:25:01 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 01DB1E514 for ; Wed, 13 Oct 2021 10:24:58 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id CEB3F4451C; Wed, 13 Oct 2021 10:24:57 +0200 (CEST) From: Dietmar Maurer To: pbs-devel@lists.proxmox.com Date: Wed, 13 Oct 2021 10:24:50 +0200 Message-Id: <20211013082452.619406-14-dietmar@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20211013082452.619406-1-dietmar@proxmox.com> References: <20211013082452.619406-1-dietmar@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.544 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [rrd.rs] Subject: [pbs-devel] [PATCH proxmox-backup 13/15] proxmox-rrd: protect against negative update time 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: Wed, 13 Oct 2021 08:25:34 -0000 --- proxmox-rrd/src/rrd.rs | 45 +++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/proxmox-rrd/src/rrd.rs b/proxmox-rrd/src/rrd.rs index 12d2ec8c..7901fe39 100644 --- a/proxmox-rrd/src/rrd.rs +++ b/proxmox-rrd/src/rrd.rs @@ -13,7 +13,7 @@ use std::path::Path; -use anyhow::{bail, Error}; +use anyhow::{bail, format_err, Error}; use serde::{Serialize, Deserialize}; @@ -77,6 +77,9 @@ impl DataSource { } fn compute_new_value(&mut self, time: f64, mut value: f64) -> Result { + if time < 0.0 { + bail!("got negative time"); + } if time <= self.last_update { bail!("time in past ({} < {})", time, self.last_update); } @@ -286,30 +289,36 @@ impl RRD { } - /// Load data from a file - pub fn load(path: &Path) -> Result { - let raw = std::fs::read(path)?; + fn from_raw(raw: &[u8]) -> Result { if raw.len() < 8 { - let msg = format!("not an rrd file - file is too small ({})", raw.len()); - return Err(std::io::Error::new(std::io::ErrorKind::Other, msg)); + bail!("not an rrd file - file is too small ({})", raw.len()); } - if raw[0..8] == rrd_v1::PROXMOX_RRD_MAGIC_1_0 { + let rrd = if raw[0..8] == rrd_v1::PROXMOX_RRD_MAGIC_1_0 { let v1 = rrd_v1::RRDv1::from_raw(&raw)?; v1.to_rrd_v2() - .map_err(|err| { - let msg = format!("unable to convert from old V1 format - {}", err); - std::io::Error::new(std::io::ErrorKind::Other, msg) - }) + .map_err(|err| format_err!("unable to convert from old V1 format - {}", err))? } else if raw[0..8] == PROXMOX_RRD_MAGIC_2_0 { serde_cbor::from_slice(&raw[8..]) - .map_err(|err| { - let msg = format!("unable to decode RRD file - {}", err); - std::io::Error::new(std::io::ErrorKind::Other, msg) - }) - } else { - let msg = format!("not an rrd file - unknown magic number"); - return Err(std::io::Error::new(std::io::ErrorKind::Other, msg)); + .map_err(|err| format_err!("unable to decode RRD file - {}", err))? + } else { + bail!("not an rrd file - unknown magic number"); + }; + + if rrd.source.last_update < 0.0 { + bail!("rrd file has negative last_update time"); + } + + Ok(rrd) + } + + /// Load data from a file + pub fn load(path: &Path) -> Result { + let raw = std::fs::read(path)?; + + match Self::from_raw(&raw) { + Ok(rrd) => Ok(rrd), + Err(err) => Err(std::io::Error::new(std::io::ErrorKind::Other, err.to_string())), } } -- 2.30.2