diff options
| author | Max Reitz <mreitz@redhat.com> | 2015-02-25 13:08:21 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-03-18 12:06:50 +0100 |
| commit | 98f44bbe70bb803e7be2421b7cc92a1c179afb87 (patch) | |
| tree | f257e066f4dd5d13044315941367b47d6336e017 /nbd.c | |
| parent | 892f5a5270f9f3cae4f384dffbf70679fa2a57b6 (diff) | |
| download | focaccia-qemu-98f44bbe70bb803e7be2421b7cc92a1c179afb87.tar.gz focaccia-qemu-98f44bbe70bb803e7be2421b7cc92a1c179afb87.zip | |
nbd: Handle blk_getlength() failure
Signed-off-by: Max Reitz <mreitz@redhat.com> Message-Id: <1424887718-10800-9-git-send-email-mreitz@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'nbd.c')
| -rw-r--r-- | nbd.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/nbd.c b/nbd.c index 34f4dbb80d..8837e751d1 100644 --- a/nbd.c +++ b/nbd.c @@ -966,7 +966,8 @@ static void blk_aio_detach(void *opaque) } NBDExport *nbd_export_new(BlockBackend *blk, off_t dev_offset, off_t size, - uint32_t nbdflags, void (*close)(NBDExport *)) + uint32_t nbdflags, void (*close)(NBDExport *), + Error **errp) { NBDExport *exp = g_malloc0(sizeof(NBDExport)); exp->refcount = 1; @@ -974,7 +975,14 @@ NBDExport *nbd_export_new(BlockBackend *blk, off_t dev_offset, off_t size, exp->blk = blk; exp->dev_offset = dev_offset; exp->nbdflags = nbdflags; - exp->size = size == -1 ? blk_getlength(blk) : size; + exp->size = size < 0 ? blk_getlength(blk) : size; + if (exp->size < 0) { + error_setg_errno(errp, -exp->size, + "Failed to determine the NBD export's length"); + goto fail; + } + exp->size -= exp->size % BDRV_SECTOR_SIZE; + exp->close = close; exp->ctx = blk_get_aio_context(blk); blk_ref(blk); @@ -986,6 +994,10 @@ NBDExport *nbd_export_new(BlockBackend *blk, off_t dev_offset, off_t size, */ blk_invalidate_cache(blk, NULL); return exp; + +fail: + g_free(exp); + return NULL; } NBDExport *nbd_export_find(const char *name) |