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 583101FF179 for ; Mon, 5 Aug 2024 14:14:21 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 8FDF558D4; Mon, 5 Aug 2024 14:14:27 +0200 (CEST) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Mon, 5 Aug 2024 14:14:21 +0200 Message-Id: <20240805121421.736820-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.060 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [RFC qemu-server] backup: always die early when volume size or format cannot be determined X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" There are cases where volume_size_info() will return undef, and not set $@. In particular, the default implementation will do so when stat on the file fails or the output of 'qemu-img info' cannot be parsed as JSON. While the size is only strictly needed for fleecing, the volume_size_info() call serves as an early sanity check otherwise. This can break backup without fleecing in certain scenarios. Using definedness checks would slightly reduce potential for breakage. To minimize that potential, doing the check only for fleecing would be the way to go. However, having a stricter check seems desirable for future-proofing to abort early when something is amiss. Signed-off-by: Fiona Ebner --- PVE/VZDump/QemuServer.pm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/PVE/VZDump/QemuServer.pm b/PVE/VZDump/QemuServer.pm index 012c9210..9291a232 100644 --- a/PVE/VZDump/QemuServer.pm +++ b/PVE/VZDump/QemuServer.pm @@ -122,7 +122,11 @@ sub prepare { if ($storeid) { # The call in list context can be expensive for certain plugins like RBD, just get size $size = eval { PVE::Storage::volume_size_info($self->{storecfg}, $volid, 5) }; - die "cannot determine size of volume '$volid' - $@\n" if $@; + if ($@ || !$size) { + my $err = "cannot determine size of volume '$volid'"; + $err .= " - $@" if $@; + die "$err\n"; + } my $scfg = PVE::Storage::storage_config($self->{storecfg}, $storeid); $format = PVE::QemuServer::qemu_img_format($scfg, $volname); @@ -130,7 +134,11 @@ sub prepare { ($size, $format) = eval { PVE::Storage::volume_size_info($self->{storecfg}, $volid, 5); }; - die "cannot determine size and format of volume '$volid' - $@\n" if $@; + if ($@ || !$size || !$format) { + my $err = "cannot determine size and format of volume '$volid'"; + $err .= " - $@" if $@; + die "$err\n"; + } } my $diskinfo = { -- 2.39.2 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel