sys: block: fix possible use of `undef`-value when detecting disk sizes

`$size` and `$logical_bsize` might get unset if there invalid, but then
are unconditionally converted to an int - which throws an error.
This was reported on the forum by a user [0].

Fix it by changing the check a bit to skip the disk immediately if
detecting either of those two values are invalid or simply not present.
The fix for `$logical_bsize` simply avoids trying to convert to value to
an int if invalid.

tl;dr: Should have no impact at all, in the end. The same
`run-env-info.json` is generated w/ and w/o the patch if all disks are
fine. I then also hacked up the script a bit to actually have an invalid
size, this resulted in the "affected" disk simply missing from the disk
array - the expected behavior in this case.

[0] https://forum.proxmox.com/threads/error-installing-proxmox-8.131921/

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>

diff --git a/Proxmox/Sys/Block.pm b/Proxmox/Sys/Block.pm
index 26085e3040f4267da838dc67b52dfa2a5a1d6fad..f76e0f1591259426030d95273040266de0492b17 100644 (file)
--- a/Proxmox/Sys/Block.pm
+++ b/Proxmox/Sys/Block.pm
@@ -90,10 +90,10 @@ my sub hd_list {
        }
 
        my $size = file_read_firstline("$bd/size");
+       next if !$size;
        chomp $size;
-       $size = undef if !($size && $size =~ m/^\d+$/);
+       next if $size !~ m/^\d+$/;
        $size = int($size);
-       next if !$size;
 
        my $model = file_read_firstline("$bd/device/model") || '';
        $model =~ s/^\s+//;
@@ -104,8 +104,11 @@ my sub hd_list {
 
        my $logical_bsize = file_read_firstline("$bd/queue/logical_block_size") // '';
        chomp $logical_bsize;
-       $logical_bsize = undef if !($logical_bsize && $logical_bsize =~ m/^\d+$/);
-       $logical_bsize = int($logical_bsize);
+       if ($logical_bsize && $logical_bsize !~ m/^\d+$/) {
+           $logical_bsize = int($logical_bsize);
+       } else {
+           $logical_bsize = undef;
+       }
 
        push @$res, [$count++, $dev_path, $size, $model, $logical_bsize, "/sys/block/$name"];
     }