public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Fiona Ebner <f.ebner@proxmox.com>
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
	Filip Schauer <f.schauer@proxmox.com>
Subject: Re: [pve-devel] [PATCH container] Fix invalid device passthrough being added to config
Date: Thu, 11 Apr 2024 14:18:47 +0200	[thread overview]
Message-ID: <a90c9302-4aa0-40a1-8a22-6de34bd34351@proxmox.com> (raw)
In-Reply-To: <20240129142911.120475-1-f.schauer@proxmox.com>

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 <f.schauer@proxmox.com>
> ---
>  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';




  reply	other threads:[~2024-04-11 12:18 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-01-29 14:29 Filip Schauer
2024-04-11 12:18 ` Fiona Ebner [this message]
2024-04-15 13:18   ` Filip Schauer

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=a90c9302-4aa0-40a1-8a22-6de34bd34351@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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal