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 50449633B1 for ; Tue, 24 Nov 2020 19:56:03 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B6C5C123D9 for ; Tue, 24 Nov 2020 19:56:02 +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 F3477123B3 for ; Tue, 24 Nov 2020 19:56:00 +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 BFF7143E9D for ; Tue, 24 Nov 2020 19:56:00 +0100 (CET) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Tue, 24 Nov 2020 19:55:47 +0100 Message-Id: <20201124185547.8832-3-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201124185547.8832-1-s.ivanov@proxmox.com> References: <20201124185547.8832-1-s.ivanov@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.086 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 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, osd.pm] Subject: [pve-devel] [PATCH manager 2/2] api2: osd destroy: untaint device before pvremove 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, 24 Nov 2020 18:56:03 -0000 We get the device list from ceph-volume lvm list, and decode the json output, which at that point is tainted (perlsec (1)). Untaint it here before calling, because it is currently the only call-site using the information in a problematic way (run_command). (the only other call-site being in pve5to6) Alternatively we could untaint while reading the information, but then should only return a small subset of the ceph-volume output. The issue is most likely due to cb9db10c1a9855cf40ff13e81f9dd97d6a9b2698 in pve-common ('run_command: improve performance for logging and long lines'), Tested on a virtual testsetup by creating OSDs with second DB disk, and destroying it via GUI (did not manage to get the error without the DB disk) Reported via our community forum: https://forum.proxmox.com/threads/insecure-dependency-in-exec-during-osd-destroy.79574/ Signed-off-by: Stoiko Ivanov --- PVE/API2/Ceph/OSD.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PVE/API2/Ceph/OSD.pm b/PVE/API2/Ceph/OSD.pm index 685b68bc..b81a8054 100644 --- a/PVE/API2/Ceph/OSD.pm +++ b/PVE/API2/Ceph/OSD.pm @@ -575,6 +575,8 @@ __PACKAGE__->register_method ({ # try to remove pvs, but do not fail if it does not work for my $osd_part (@{$osd_list->{$osdid}}) { for my $dev (@{$osd_part->{devices}}) { + ($dev) = ($dev =~ m|^(/dev/[-_.a-zA-Z0-9\/]+)$|); #untaint + eval { run_command(['/sbin/pvremove', $dev], errfunc => sub {}) }; warn $@ if $@; } -- 2.20.1