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 22A7C91672 for ; Mon, 29 Jan 2024 15:29:47 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 02FFA17522 for ; Mon, 29 Jan 2024 15:29:17 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 for ; Mon, 29 Jan 2024 15:29:15 +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 BAE74492FA for ; Mon, 29 Jan 2024 15:29:15 +0100 (CET) From: Filip Schauer To: pve-devel@lists.proxmox.com Date: Mon, 29 Jan 2024 15:29:11 +0100 Message-Id: <20240129142911.120475-1-f.schauer@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.125 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 SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [config.pm, lxc.pm] Subject: [pve-devel] [PATCH container] Fix invalid device passthrough being added to config 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: Mon, 29 Jan 2024 14:29:47 -0000 Fix a bug that allows a device passthrough entry to be added to the config despite the device path not pointing to a device. Previously, adding an invalid device passthrough entry would throw an error, but the entry would still be added to the config. This is fixed by moving the respective checks from update_lxc_config to update_pct_config, which is run before the entry is written to the config file. Signed-off-by: Filip Schauer --- src/PVE/LXC.pm | 8 -------- src/PVE/LXC/Config.pm | 19 ++++++++++++++++++- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index 7883cfb..f0c000b 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -643,20 +643,12 @@ sub update_lxc_config { PVE::LXC::Config->foreach_passthrough_device($conf, sub { my ($key, $device) = @_; - die "Path is not defined for passthrough device $key" - unless (defined($device->{path})); - my $absolute_path = $device->{path}; my ($mode, $rdev) = (stat($absolute_path))[2, 6]; - die "Device $absolute_path does not exist\n" if $! == ENOENT; - die "Error accessing device $absolute_path\n" if (!defined($mode) || !defined($rdev)); - die "$absolute_path is not a device\n" - if (!S_ISBLK($mode) && !S_ISCHR($mode)); - my $major = PVE::Tools::dev_t_major($rdev); my $minor = PVE::Tools::dev_t_minor($rdev); my $device_type_char = S_ISBLK($mode) ? 'b' : 'c'; diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm index 5ac1446..4ea103e 100644 --- a/src/PVE/LXC/Config.pm +++ b/src/PVE/LXC/Config.pm @@ -3,7 +3,8 @@ package PVE::LXC::Config; use strict; use warnings; -use Fcntl qw(O_RDONLY); +use Errno qw(ENOENT); +use Fcntl qw(O_RDONLY :mode); use PVE::AbstractConfig; use PVE::Cluster qw(cfs_register_file); @@ -1193,6 +1194,22 @@ sub update_pct_config { die "$opt: MTU size '$mtu' is bigger than bridge MTU '$bridge_mtu'\n" if ($mtu > $bridge_mtu); } + } elsif ($opt =~ m/^dev(\d+)$/) { + my $device = $class->parse_device($value); + + die "Path is not defined for passthrough device $opt" + unless (defined($device->{path})); + + my $absolute_path = $device->{path}; + my ($mode, $rdev) = (stat($absolute_path))[2, 6]; + + die "Device $absolute_path does not exist\n" if $! == ENOENT; + + die "Error accessing device $absolute_path\n" + if (!defined($mode) || !defined($rdev)); + + die "$absolute_path is not a device\n" + if (!S_ISBLK($mode) && !S_ISCHR($mode)); } $conf->{pending}->{$opt} = $value; $class->remove_from_pending_delete($conf, $opt); -- 2.39.2