followup: code cleanup and uninitialized value access fix

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index 13ead7fd505d89ed5f2eea3dfb4e50af464b095e..2252685be47f19dc4a5e8ad024462bd1ce3d662e 100644 (file)
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -1415,11 +1415,11 @@ sub mountpoint_mount {
 
     die "unknown snapshot path for '$volid'" if !$storage && defined($snapname);
 
-    my @mountoptions= split(/;/, $mountpoint->{mountoptions});
     my $optlist = [];
-    my $allowed_options = PVE::LXC::Config::get_mount_options();
-    foreach my $opt (@mountoptions) {
-       push @$optlist, $opt if $opt =~ $allowed_options
+
+    if (my $mountopts = $mountpoint->{mountoptions}) {
+       my @opts = split(/;/, $mountpoint->{mountoptions});
+       push @$optlist, grep { PVE::LXC::Config::is_valid_mount_option($_) } @opts;
     }
 
     my $acl = $mountpoint->{acl};

diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm
index 71788bae2cf0e989e1003fae015093b22a37d0f0..49f234594ced907fdd712a10450bc275f4a8ceab 100644 (file)
--- a/src/PVE/LXC/Config.pm
+++ b/src/PVE/LXC/Config.pm
@@ -216,10 +216,12 @@ sub __snapshot_foreach_volume {
 
 cfs_register_file('/lxc/', \&parse_pct_config, \&write_pct_config);
 
-my $mount_option = qr/(noatime|nodev|nosuid|noexec)/;
 
-sub get_mount_options {
-    return $mount_option;
+my $valid_mount_option_re = qr/(noatime|nodev|nosuid|noexec)/;
+
+sub is_valid_mount_option {
+    my ($option) = @_;
+    return $option =~ $valid_mount_option_re;
 }
 
 my $rootfs_desc = {
@@ -247,7 +249,7 @@ my $rootfs_desc = {
        type => 'string',
        description => 'Extra mount options for rootfs/mps.',
        format_description => 'opt[;opt...]',
-       pattern => qr/$mount_option(;$mount_option)*/,
+       pattern => qr/$valid_mount_option_re(;$valid_mount_option_re)*/,
     },
     ro => {
        type => 'boolean',