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 0C65362891 for ; Tue, 27 Oct 2020 11:12:20 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 014A816847 for ; Tue, 27 Oct 2020 11:12:20 +0100 (CET) Received: from dev.dominic.proxmox.com (212-186-127-178.static.upcbusiness.at [212.186.127.178]) by firstgate.proxmox.com (Proxmox) with ESMTP id E6FEA1683B for ; Tue, 27 Oct 2020 11:12:18 +0100 (CET) Received: by dev.dominic.proxmox.com (Postfix, from userid 0) id BE0FD22620; Tue, 27 Oct 2020 11:12:18 +0100 (CET) From: =?UTF-8?q?Dominic=20J=C3=A4ger?= To: pve-devel@lists.proxmox.com Date: Tue, 27 Oct 2020 11:12:07 +0100 Message-Id: <20201027101207.73749-1-d.jaeger@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 2 AWL -1.602 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.4 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record TVD_SUBJ_WIPE_DEBT 2.291 Spam advertising a way to eliminate debt URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lvmthinplugin.pm] Subject: [pve-devel] [PATCH storage] lvmthin: Match snapshot remove regex to allowed names 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, 27 Oct 2020 10:12:20 -0000 We allow snapshot names that match pve-configid but during qm destroy we have not removed all snapshots that match pve-configid so far. For example, the name x-y was allowed but the resulting snap_vm-105-disk-0_x-y was not removed. Reported-by: Hannes Laimer Signed-off-by: Dominic Jäger --- Something like m/^snap_${volname}_${configidre}$/ would maybe be nicer, but I didn't see how to get that RE from JSONSchema in a shorter way than that single function call. PVE/Storage/LvmThinPlugin.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PVE/Storage/LvmThinPlugin.pm b/PVE/Storage/LvmThinPlugin.pm index d1c5b1f..4af57be 100644 --- a/PVE/Storage/LvmThinPlugin.pm +++ b/PVE/Storage/LvmThinPlugin.pm @@ -117,7 +117,8 @@ sub free_image { # remove all volume snapshots first foreach my $lv (keys %$dat) { - next if $lv !~ m/^snap_${volname}_(\w+)$/; + next if $lv !~ m/^snap_${volname}_(.+)$/; + next if !PVE::JSONSchema::pve_verify_configid($1, 1); my $cmd = ['/sbin/lvremove', '-f', "$vg/$lv"]; run_command($cmd, errmsg => "lvremove snapshot '$vg/$lv' error"); } -- 2.20.1