From: Philippe Mathieu-Daudé <philmd@redhat.com>
Date: Wed, 18 Mar 2020 22:22:35 +0000 (+0100)
Subject: block: Assert BlockDriver::format_name is not NULL
X-Git-Tag: v5.0.0-rc0~2^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a15f08dceebce63ee15c91c7d74265d61d882ae5;p=thirdparty%2Fqemu.git

block: Assert BlockDriver::format_name is not NULL

bdrv_do_find_format() calls strcmp() using BlockDriver::format_name
as argument, which must not be NULL. Assert this field is not null
when we register a block driver in bdrv_register().

Reported-by: Mansour Ahmadi <ManSoSec@gmail.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-Id: <20200318222235.23856-1-philmd@redhat.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---

diff --git a/block.c b/block.c
index a2542c977b9..6b984dc883e 100644
--- a/block.c
+++ b/block.c
@@ -363,6 +363,7 @@ char *bdrv_get_full_backing_filename(BlockDriverState *bs, Error **errp)
 
 void bdrv_register(BlockDriver *bdrv)
 {
+    assert(bdrv->format_name);
     QLIST_INSERT_HEAD(&bdrv_drivers, bdrv, list);
 }