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 CBD7E9E773 for ; Tue, 28 Nov 2023 09:59:28 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AC62B1320D for ; Tue, 28 Nov 2023 09:58:58 +0100 (CET) Received: from lana.proxmox.com (unknown [94.136.29.99]) by firstgate.proxmox.com (Proxmox) with ESMTP for ; Tue, 28 Nov 2023 09:58:58 +0100 (CET) Received: by lana.proxmox.com (Postfix, from userid 10043) id 204822C1630; Tue, 28 Nov 2023 09:58:58 +0100 (CET) From: Stefan Hanreich To: pve-devel@lists.proxmox.com Date: Tue, 28 Nov 2023 09:58:57 +0100 Message-Id: <20231128085857.61974-1-s.hanreich@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.416 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 RDNS_NONE 0.793 Delivered to internal network by a host with no rDNS 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH pve-network] dhcp: dnsmasq: Use dir_glob_foreach for deleting configuration files 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, 28 Nov 2023 08:59:28 -0000 The current invocation is quite unsafe and triggers the taint mode of Perl. Replacing it with dir_glob_foreach solves those issues. Reported-By: Friedrich Weber Signed-off-by: Stefan Hanreich --- I wasn't sure whether directly unlinking the files in the callback would influence the iteration, hence why I store them in an intermediate array. Also, unlinking them all at once probably is better than unlinking them one-by-one (although it shouldn't matter with the low amount of files here..) src/PVE/Network/SDN/Dhcp/Dnsmasq.pm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm index e65e973..2844943 100644 --- a/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm +++ b/src/PVE/Network/SDN/Dhcp/Dnsmasq.pm @@ -234,7 +234,13 @@ CFG $default_dnsmasq_config ); - unlink glob "$config_directory/10-*.conf"; + my @config_files = (); + PVE::Tools::dir_glob_foreach($config_directory, '10-.*\.conf', sub { + my ($file) = @_; + push @config_files, "$config_directory/$file"; + }); + + unlink @config_files; } sub after_configure { -- 2.39.2