diff options
| author | Liam Merwick <Liam.Merwick@oracle.com> | 2018-11-05 21:38:36 +0000 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2018-11-12 17:49:21 +0100 |
| commit | 602414d1232723d92836babe8d7014b57b93e4d9 (patch) | |
| tree | 2188b97580e434244b57c845c1efc1ddae5ec68e /block | |
| parent | c2032289b0c46597a4da7017a7869f2b41f8be16 (diff) | |
| download | qemu-602414d1232723d92836babe8d7014b57b93e4d9.zip | |
block: Null pointer dereference in blk_root_get_parent_desc()
The dev_id returned by the call to blk_get_attached_dev_id() in
blk_root_get_parent_desc() can be NULL (an internal call to
object_get_canonical_path may have returned NULL).
Instead of just checking this case before before dereferencing,
adjust blk_get_attached_dev_id() to return the empty string if no
object path can be found (similar to the case when blk->dev is NULL
and an empty string is returned).
Signed-off-by: Liam Merwick <Liam.Merwick@oracle.com>
Message-id: 1541453919-25973-3-git-send-email-Liam.Merwick@oracle.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'block')
| -rw-r--r-- | block/block-backend.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block/block-backend.c b/block/block-backend.c index 2a8f3b55f8..60d37a0c3d 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -918,7 +918,8 @@ char *blk_get_attached_dev_id(BlockBackend *blk) } else if (dev->id) { return g_strdup(dev->id); } - return object_get_canonical_path(OBJECT(dev)); + + return object_get_canonical_path(OBJECT(dev)) ?: g_strdup(""); } /* |