[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v5 2/5] block: Null pointer dereference in blk_root_
From: |
Liam Merwick |
Subject: |
[Qemu-block] [PATCH v5 2/5] block: Null pointer dereference in blk_root_get_parent_desc() |
Date: |
Mon, 5 Nov 2018 21:38:36 +0000 |
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 <address@hidden>
---
block/block-backend.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/block/block-backend.c b/block/block-backend.c
index dc0cd5772413..a2061a565024 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("");
}
/*
--
1.8.3.1
- [Qemu-block] [PATCH v5 0/5] off-by-one and NULL pointer accesses detected by static analysis, Liam Merwick, 2018/11/05
- [Qemu-block] [PATCH v5 5/5] qcow2: Read outside array bounds in qcow2_pre_write_overlap_check(), Liam Merwick, 2018/11/05
- [Qemu-block] [PATCH v5 4/5] block: Fix potential Null pointer dereferences in vvfat.c, Liam Merwick, 2018/11/05
- [Qemu-block] [PATCH v5 1/5] job: Fix off-by-one assert checks for JobSTT and JobVerbTable, Liam Merwick, 2018/11/05
- [Qemu-block] [PATCH v5 2/5] block: Null pointer dereference in blk_root_get_parent_desc(),
Liam Merwick <=
- [Qemu-block] [PATCH v5 3/5] qemu-img: assert block_job_get() does not return NULL in img_commit(), Liam Merwick, 2018/11/05
- Re: [Qemu-block] [PATCH v5 0/5] off-by-one and NULL pointer accesses detected by static analysis, Max Reitz, 2018/11/11