| Message ID | 1541453919-25973-3-git-send-email-Liam.Merwick@oracle.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | off-by-one and NULL pointer accesses detected by static analysis | expand |
On 05.11.18 22:38, Liam Merwick wrote: > 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> > --- > block/block-backend.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Reviewed-by: Max Reitz <mreitz@redhat.com>
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(""); } /*
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> --- block/block-backend.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)