proxmox-mirrors/pve-installer
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-installer synced 2025-08-16 12:25:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
`$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>
This commit is contained in:
Christoph Heiss 2023-08-09 15:44:24 +02:00 committed by Wolfgang Bumiller
parent b37e1a92e3
commit 15b2cd7632
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Proxmox/Sys/Block.pm
View File

@ -90,10 +90,10 @@ my sub hd_list {
}
my $size = file_read_firstline("$bd/size");
chomp $size;
$size = undef if !($size && $size =~ m/^\d+$/);
$size = int($size);
next if !$size;
chomp $size;
next if $size !~ m/^\d+$/;
$size = int($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"];
}