From 019b74103bddf7cd8ad0e2f97fcafb516a35ac0f Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 16 Dec 2021 14:14:43 +0100 Subject: [PATCH] virDomainDiskInsert: Don't access NULL disk target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 'virDomainDiskInsert' orders the inserted disks by target. If the target is not provided though it would try to parse it anyways. This lead to a crash when parsing a definition where there are multiple disks and of two disks sharing the bus at least one also misses the target. Since we want to actually use the parser for stuff which doesn't necessarily need the disk target, we make virDomainDiskInsert tolerant of missing target instead. The definition will be rejected by the validator regardless of the order the disks were inserted in. Fixes: 61fd7174 Closes: https://gitlab.com/libvirt/libvirt/-/issues/257 Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- src/conf/domain_conf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9a21ac10ce..e0c92816f1 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15653,6 +15653,7 @@ void virDomainDiskInsert(virDomainDef *def, /* If bus matches and current disk is after * new disk, then new disk should go here */ if (def->disks[idx]->bus == disk->bus && + def->disks[idx]->dst && disk->dst && (virDiskNameToIndex(def->disks[idx]->dst) > virDiskNameToIndex(disk->dst))) { insertAt = idx;