From: Fiona Ebner <f.ebner@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
Filip Schauer <f.schauer@proxmox.com>
Subject: [pve-devel] applied: [PATCH v3 container] fix invalid device passthrough being added to config
Date: Tue, 16 Apr 2024 12:47:52 +0200 [thread overview]
Message-ID: <2dc344e6-2ec4-407a-b627-2ea83ae48005@proxmox.com> (raw)
In-Reply-To: <20240416092717.60511-1-f.schauer@proxmox.com>
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!
next prev parent reply other threads:[~2024-04-16 10:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-16 9:27 [pve-devel] " Filip Schauer
2024-04-16 10:47 ` Fiona Ebner [this message]
2024-04-16 10:56 ` [pve-devel] applied: " Fiona Ebner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2dc344e6-2ec4-407a-b627-2ea83ae48005@proxmox.com \
--to=f.ebner@proxmox.com \
--cc=f.schauer@proxmox.com \
--cc=pve-devel@lists.proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox