From ceb7b1ed09c4acc76496742606d1865fcf3777e5 Mon Sep 17 00:00:00 2001 From: Fabian Ebner Date: Tue, 20 Apr 2021 14:07:50 +0200 Subject: [PATCH] diskmanage: get_partnum: fix check Not replacing it with return, because the current behavior is dying: Can't "next" outside a loop block and the single existing caller in pve-manager's API2/Ceph/OSD.pm does not check the return value. Also check for $st, which can be undefined in case a non-existing path was provided. This also led to dying previously: Can't call method "mode" on an undefined value Signed-off-by: Fabian Ebner --- PVE/Diskmanage.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm index 853d333..b916d2e 100644 --- a/PVE/Diskmanage.pm +++ b/PVE/Diskmanage.pm @@ -750,7 +750,9 @@ sub get_partnum { my $st = stat($part_path); - next if !$st->mode || !S_ISBLK($st->mode) || !$st->rdev; + die "error detecting block device '$part_path'\n" + if !$st || !$st->mode || !S_ISBLK($st->mode) || !$st->rdev; + my $major = PVE::Tools::dev_t_major($st->rdev); my $minor = PVE::Tools::dev_t_minor($st->rdev); my $partnum_path = "/sys/dev/block/$major:$minor/"; -- 2.39.2