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 6C13A94EE8 for ; Thu, 11 Apr 2024 14:18:49 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4891730FF4 for ; Thu, 11 Apr 2024 14:18:49 +0200 (CEST) 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 ; Thu, 11 Apr 2024 14:18:48 +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 53D9A44231 for ; Thu, 11 Apr 2024 14:18:48 +0200 (CEST) Message-ID: Date: Thu, 11 Apr 2024 14:18:47 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Proxmox VE development discussion , Filip Schauer References: <20240129142911.120475-1-f.schauer@proxmox.com> Content-Language: en-US From: Fiona Ebner In-Reply-To: <20240129142911.120475-1-f.schauer@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.071 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lxc.pm, proxmox.com, config.pm] Subject: Re: [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: Thu, 11 Apr 2024 12:18:49 -0000 Am 29.01.24 um 15:29 schrieb Filip Schauer: > 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})); Pre-existing style nit that "unless" should not be used according to our style guide: https://pve.proxmox.com/wiki/Perl_Style_Guide#Perl_syntax_choices > - > 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)); > - Is there any downside to keeping these checks here as well? What a path points to might change in between being set in the config and some later time when the container is started, so these checks still make sense here IMHO. Could then become a helper function since it's used in two places, which would also reduce the amount of lines in the update_{pct,lxc}_config functions. > 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';