From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.ebner@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) server-digest SHA256)
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 741F7968A4
for <pve-devel@lists.proxmox.com>; Tue, 16 Apr 2024 12:48:24 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 522121818E
for <pve-devel@lists.proxmox.com>; Tue, 16 Apr 2024 12:47:54 +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 <pve-devel@lists.proxmox.com>; Tue, 16 Apr 2024 12:47:53 +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 5648B4558A
for <pve-devel@lists.proxmox.com>; Tue, 16 Apr 2024 12:47:53 +0200 (CEST)
Message-ID: <2dc344e6-2ec4-407a-b627-2ea83ae48005@proxmox.com>
Date: Tue, 16 Apr 2024 12:47:52 +0200
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Filip Schauer <f.schauer@proxmox.com>
References: <20240416092717.60511-1-f.schauer@proxmox.com>
Content-Language: en-US
From: Fiona Ebner <f.ebner@proxmox.com>
In-Reply-To: <20240416092717.60511-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
Subject: [pve-devel] applied: [PATCH v3 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 <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: Tue, 16 Apr 2024 10:48:24 -0000
Am 16.04.24 um 11:27 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 <f.schauer@proxmox.com>
(...)
> diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm
> index 5ac1446..408140f 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);
I dropped the above hunk, because it's a left-over from a previous
version AFAICT.
> @@ -1193,6 +1194,14 @@ 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"
> + if !defined($device->{path});
> +
> + # Validate device
> + PVE::LXC::Tools::get_device_mode_and_rdev($device->{path});
> }
> $conf->{pending}->{$opt} = $value;
> $class->remove_from_pending_delete($conf, $opt);
With that, applied, thanks!