From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <s.ivanov@proxmox.com> 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 E3B8360B17 for <pve-devel@lists.proxmox.com>; Fri, 9 Oct 2020 17:13:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D1B2817641 for <pve-devel@lists.proxmox.com>; Fri, 9 Oct 2020 17:13:59 +0200 (CEST) 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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 1BDC617636 for <pve-devel@lists.proxmox.com>; Fri, 9 Oct 2020 17:13: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 D66CE45CBE for <pve-devel@lists.proxmox.com>; Fri, 9 Oct 2020 17:13:57 +0200 (CEST) From: Stoiko Ivanov <s.ivanov@proxmox.com> To: pve-devel@lists.proxmox.com Date: Fri, 9 Oct 2020 17:13:44 +0200 Message-Id: <20201009151344.8999-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.052 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, zfsplugin.pm] Subject: [pve-devel] [PATCH storage] ZFSPlugin: untaint lun number X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/> List-Post: <mailto:pve-devel@lists.proxmox.com> List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe> X-List-Received-Date: Fri, 09 Oct 2020 15:14:00 -0000 ZFS over iSCSI fetches information about the disk-images via ssh, thus the obtainted data is tainted (perlsec (1)). Since pvedaemon runs with '-T' enabled trying to start a VM via GUI/API failed, while it still worked via `qm` or `pvesh`. The issue surfaced after commit cb9db10c1a9855cf40ff13e81f9dd97d6a9b2698 in pve-common ('run_command: improve performance for logging and long lines'), and results from concatenating the original (tainted) buffer to a variable, instead of a captured subgroup. Untainting the value in ZFSPlugin should not cause any regressiosn, since the other 3 target providers already have a match on '\d+' for retrieving the lun number. reported via pve-user [0]. reproduced and tested by setting up a LIO-target (on top of a virtual PVE), adding it as storage and trying to start a guest (with a disk on the ZFS over iSCSI storage) with `perl -T /usr/sbin/qm start $vmid` [0] https://lists.proxmox.com/pipermail/pve-user/2020-October/172055.html Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com> --- PVE/Storage/ZFSPlugin.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/PVE/Storage/ZFSPlugin.pm b/PVE/Storage/ZFSPlugin.pm index 383f0a0..63b9551 100644 --- a/PVE/Storage/ZFSPlugin.pm +++ b/PVE/Storage/ZFSPlugin.pm @@ -159,7 +159,11 @@ sub zfs_get_lun_number { die "could not find lun_number for guid $guid" if !$guid; - return $class->zfs_request($scfg, undef, 'list_view', $guid); + if ($class->zfs_request($scfg, undef, 'list_view', $guid) =~ /^(\d+)$/) { + return $1; + } + + die "lun_number for guid $guid is not a number"; } # Configuration -- 2.20.1