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) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 58DA074DBD for ; Tue, 22 Jun 2021 18:40:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 40DA32AA14 for ; Tue, 22 Jun 2021 18:40:09 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id BE2D52AA08 for ; Tue, 22 Jun 2021 18:40:05 +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 886E644321 for ; Tue, 22 Jun 2021 18:40:05 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Tue, 22 Jun 2021 18:39:54 +0200 Message-Id: <20210622163954.5580-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.655 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. [proxmox.com, pbsplugin.pm, plugin.pm] Subject: [pve-devel] [PATCH storage] plugins: untaint volume_size_info retuns 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: , X-List-Received-Date: Tue, 22 Jun 2021 16:40:39 -0000 the size returned by volume_size_info is used for creating the new destination image in PVE::QemuServer::clone_disk (and probably elsewhere). In certain cases the return values are tainted - they are obtained by a run_command call and depending on the format and length of the parsed output can still have their tainted attribute. One example of a tainted return has been reported in our community-forum: https://forum.proxmox.com/threads/cannot-clone-vm-or-move-disk-with-more-than-13-snapshots.89628/ A qcow2 image with 13 snapshots generates a output > 4k in length from `qemu-img info --output=json`, which in turn causes the output to be considered tainted. This patch untaints the returns where applicable. The other storage-plugins are not affected: * LVMPlugin returns a single number and a newline (thus gets untainted by run_command) * RBDPlugin untaints the complete json before decoding * ZFSPoolplugin and ISCSIDirectPlugin explicitly untaint their returns. Signed-off-by: Stoiko Ivanov --- Note: Not really a v2, since it's a different patch, but addresses the same issue as in https://lists.proxmox.com/pipermail/pve-devel/2021-June/048910.html PVE/Storage/PBSPlugin.pm | 4 +++- PVE/Storage/Plugin.pm | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/PVE/Storage/PBSPlugin.pm b/PVE/Storage/PBSPlugin.pm index a439dd2..2576764 100644 --- a/PVE/Storage/PBSPlugin.pm +++ b/PVE/Storage/PBSPlugin.pm @@ -811,7 +811,9 @@ sub volume_size_info { my $size = 0; foreach my $info (@$data) { - $size += $info->{size} if $info->{size}; + if ($info->{size} && $info->{size} =~ /^(\d+)$/) { + $size += $1; + } } my $used = $size; diff --git a/PVE/Storage/Plugin.pm b/PVE/Storage/Plugin.pm index d330845..2bcbc84 100644 --- a/PVE/Storage/Plugin.pm +++ b/PVE/Storage/Plugin.pm @@ -837,6 +837,12 @@ sub file_size_info { my ($size, $format, $used, $parent) = $info->@{qw(virtual-size format actual-size backing-filename)}; + ($size) = ($size =~ /^(\d+)$/); #untaint + ($used) = ($used =~ /^(\d+)$/); #untaint + ($format) = ($format =~ /^([-\w]+)$/); #untaint + if (defined($parent)) { + ($parent) = ($parent =~ /^(.*)$/); #untaint + } return wantarray ? ($size, $format, $used, $parent, $st->ctime) : $size; } -- 2.20.1