From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <f.schauer@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))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id C554F96714
for <pve-devel@lists.proxmox.com>; Tue, 16 Apr 2024 11:27:22 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id A671016EA1
for <pve-devel@lists.proxmox.com>; Tue, 16 Apr 2024 11:27:22 +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))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Tue, 16 Apr 2024 11:27:22 +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 D090244DF7
for <pve-devel@lists.proxmox.com>; Tue, 16 Apr 2024 11:27:21 +0200 (CEST)
From: Filip Schauer <f.schauer@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 16 Apr 2024 11:27:17 +0200
Message-Id: <20240416092717.60511-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.075 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] [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 09:27:22 -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 <f.schauer@proxmox.com>
---
Changes since v2:
* Rename get_device_stat to get_device_mode_and_rdev and move it from
PVE::Tools to PVE::LXC::Tools.
* Cleanup formatting of post-ifs in get_device_mode_and_rdev
Changes since v1:
* Use "if" instead of "unless"
* Move device path validation and stat to seperate helper function
src/PVE/LXC.pm | 18 ++++--------------
src/PVE/LXC/Config.pm | 11 ++++++++++-
src/PVE/LXC/Tools.pm | 15 +++++++++++++++
3 files changed, 29 insertions(+), 15 deletions(-)
diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index 9681d74..e688ea6 100644
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -4,7 +4,7 @@ use strict;
use warnings;
use Cwd qw();
-use Errno qw(ELOOP ENOENT ENOTDIR EROFS ECONNREFUSED EEXIST);
+use Errno qw(ELOOP ENOTDIR EROFS ECONNREFUSED EEXIST);
use Fcntl qw(O_RDONLY O_WRONLY O_NOFOLLOW O_DIRECTORY :mode);
use File::Path;
use File::Spec;
@@ -643,20 +643,10 @@ 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));
+ die "Path is not defined for passthrough device $key\n"
+ if !defined($device->{path});
+ my ($mode, $rdev) = PVE::LXC::Tools::get_device_mode_and_rdev($device->{path});
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..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);
@@ -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);
diff --git a/src/PVE/LXC/Tools.pm b/src/PVE/LXC/Tools.pm
index f96756d..7e3e530 100644
--- a/src/PVE/LXC/Tools.pm
+++ b/src/PVE/LXC/Tools.pm
@@ -4,6 +4,8 @@ package PVE::LXC::Tools;
use strict;
use warnings;
+use POSIX qw(ENOENT S_ISBLK S_ISCHR);
+
use PVE::SafeSyslog;
# LXC introduced an `lxc.hook.version` property which allows hooks to be executed in different
@@ -152,6 +154,19 @@ sub cgroup_do_write($$) {
return 1;
}
+sub get_device_mode_and_rdev($) {
+ my ($path) = @_;
+
+ die "Path is not defined\n" if !defined($path);
+
+ my ($mode, $rdev) = (stat($path))[2, 6];
+ die "Device $path does not exist\n" if $! == ENOENT;
+ die "Error accessing device $path\n" if !defined($mode) || !defined($rdev);
+ die "$path is not a device\n" if !S_ISBLK($mode) && !S_ISCHR($mode);
+
+ return ($mode, $rdev);
+}
+
# Tries to the architecture of an executable file based on its ELF header.
sub detect_elf_architecture {
my ($elf_fn) = @_;
--
2.39.2