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 BE9EE61F14 for ; Fri, 10 Jul 2020 20:12:02 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A6B872540E for ; Fri, 10 Jul 2020 20:11:32 +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 74F1625403 for ; Fri, 10 Jul 2020 20:11:31 +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 3F2C442F77 for ; Fri, 10 Jul 2020 20:11:31 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Fri, 10 Jul 2020 20:11:28 +0200 Message-Id: <20200710181128.30097-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 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. [guesthelpers.pm] Subject: [pve-devel] [PATCH guest-common] fix #2834: skip refs in config_with_pending_array 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: Fri, 10 Jul 2020 18:12:02 -0000 With the refactoring of config_with_pending_array in daf8fca57a34417365c873ed91f3a52bf0002a4f a few sanity checks on parsed configs were dropped. One case where a config value should be skipped, instead of parsed and added is when the value is not scalar. This is the case for the raw lxc keys (e.g. lxc.init.cmd, lxc.apparmor.profile) - which get added as array to the 'lxc' key. This patch reintroduces the skipping of non-scalar values, when parsing the config but not for the pending values. >From a short look through the commit history the sanity checks were in place since 2014 (introduced in qemu-server for handling pending configuration changes), and their removal did not cause any other regressions. To my knowledge only the raw lxc config keys are parsed into a non-scalar value. Tested by adding a 'lxc.init.cmd' key to a container config. Signed-off-by: Stoiko Ivanov --- I hope that I did not miss another case where the sanity-checks are necessary, and can gladly send a v2 reintroducing all of them. PVE/GuestHelpers.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PVE/GuestHelpers.pm b/PVE/GuestHelpers.pm index 16ab3ac..69a05d9 100644 --- a/PVE/GuestHelpers.pm +++ b/PVE/GuestHelpers.pm @@ -214,6 +214,8 @@ sub config_with_pending_array { my $res = []; foreach my $opt (keys %$conf) { + next if ref($conf->{$opt}); + my $item = { key => $opt, value => $conf->{$opt}, -- 2.20.1