diff mbox

[v2,3/9] block: Handle error of bdrv_getlength in bdrv_create_dirty_bitmap

Message ID 1394605864-32237-4-git-send-email-famz@redhat.com
State New
Headers show

Commit Message

Fam Zheng March 12, 2014, 6:30 a.m. UTC 
bdrv_getlength could fail, check the return value before using it.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 block.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

Comments

Benoît Canet March 13, 2014, 1:29 p.m. UTC | #1 
The Wednesday 12 Mar 2014 à 14:30:58 (+0800), Fam Zheng wrote :
> bdrv_getlength could fail, check the return value before using it.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  block.c | 7 ++++++-
>  1 file changed, 6 insertions(+), 1 deletion(-)
> 
> diff --git a/block.c b/block.c
> index ce48fff..9de1385 100644
> --- a/block.c
> +++ b/block.c
> @@ -5083,7 +5083,12 @@ BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs,
>      }
>      granularity >>= BDRV_SECTOR_BITS;
>      assert(granularity);
> -    bitmap_size = (bdrv_getlength(bs) >> BDRV_SECTOR_BITS);
> +    bitmap_size = bdrv_getlength(bs);
> +    if (bitmap_size < 0) {
> +        error_setg(errp, "could not get length of device");
> +        return NULL;
> +    }
> +    bitmap_size >>= BDRV_SECTOR_BITS;
>      bitmap = g_malloc0(sizeof(BdrvDirtyBitmap));
>      bitmap->bitmap = hbitmap_alloc(bitmap_size, ffs(granularity) - 1);
>      if (name) {
> -- 
> 1.9.0
> 
> 
Reviewed-by: Benoit Canet <benoit@irqsave.net>
diff mbox

Patch

diff --git a/block.c b/block.c
index ce48fff..9de1385 100644
--- a/block.c
+++ b/block.c
@@ -5083,7 +5083,12 @@  BdrvDirtyBitmap *bdrv_create_dirty_bitmap(BlockDriverState *bs,
     }
     granularity >>= BDRV_SECTOR_BITS;
     assert(granularity);
-    bitmap_size = (bdrv_getlength(bs) >> BDRV_SECTOR_BITS);
+    bitmap_size = bdrv_getlength(bs);
+    if (bitmap_size < 0) {
+        error_setg(errp, "could not get length of device");
+        return NULL;
+    }
+    bitmap_size >>= BDRV_SECTOR_BITS;
     bitmap = g_malloc0(sizeof(BdrvDirtyBitmap));
     bitmap->bitmap = hbitmap_alloc(bitmap_size, ffs(granularity) - 1);
     if (name) {