[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/8] block: fix null-pointer bug on error case in bl
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 1/8] block: fix null-pointer bug on error case in block commit |
Date: |
Fri, 18 Jan 2013 17:28:34 +0100 |
From: Jeff Cody <address@hidden>
This is a bug that was caught by a coverity run by Markus. In
the error case when we errored out to exit_restore_open early in the
function, 'overlay_bs' was still NULL at that point, although it is
used to look up flags and perform a bdrv_reopen().
Move the overlay_bs lookup to where it is needed, and check for NULL
before restoring the flags. Also get rid of the unneeded parameter
initialization.
Reported-By: Markus Armbruster <address@hidden>
Signed-off-by: Jeff Cody <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block/commit.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/block/commit.c b/block/commit.c
index 61ebdba..553447e 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -65,7 +65,7 @@ static void coroutine_fn commit_run(void *opaque)
BlockDriverState *active = s->active;
BlockDriverState *top = s->top;
BlockDriverState *base = s->base;
- BlockDriverState *overlay_bs = NULL;
+ BlockDriverState *overlay_bs;
int64_t sector_num, end;
int ret = 0;
int n = 0;
@@ -92,8 +92,6 @@ static void coroutine_fn commit_run(void *opaque)
}
}
- overlay_bs = bdrv_find_overlay(active, top);
-
end = s->common.len >> BDRV_SECTOR_BITS;
buf = qemu_blockalign(top, COMMIT_BUFFER_SIZE);
@@ -156,7 +154,8 @@ exit_restore_reopen:
if (s->base_flags != bdrv_get_flags(base)) {
bdrv_reopen(base, s->base_flags, NULL);
}
- if (s->orig_overlay_flags != bdrv_get_flags(overlay_bs)) {
+ overlay_bs = bdrv_find_overlay(active, top);
+ if (overlay_bs && s->orig_overlay_flags != bdrv_get_flags(overlay_bs)) {
bdrv_reopen(overlay_bs, s->orig_overlay_flags, NULL);
}
--
1.8.0.2
- [Qemu-devel] [PULL for-1.4 0/8] Block patches, Stefan Hajnoczi, 2013/01/18
- [Qemu-devel] [PATCH 2/8] ide: Remove wrong assertion, Stefan Hajnoczi, 2013/01/18
- [Qemu-devel] [PATCH 1/8] block: fix null-pointer bug on error case in block commit,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 4/8] win32-aio: Fix vectored reads, Stefan Hajnoczi, 2013/01/18
- [Qemu-devel] [PATCH 5/8] win32-aio: Fix memory leak, Stefan Hajnoczi, 2013/01/18
- [Qemu-devel] [PATCH 6/8] win32-aio: use iov utility functions instead of open-coding them, Stefan Hajnoczi, 2013/01/18
- [Qemu-devel] [PATCH 3/8] aio: Fix return value of aio_poll(), Stefan Hajnoczi, 2013/01/18
- [Qemu-devel] [PATCH 7/8] dataplane: avoid reentrancy during virtio_blk_data_plane_stop(), Stefan Hajnoczi, 2013/01/18
- [Qemu-devel] [PATCH 8/8] dataplane: support viostor virtio-pci status bit setting, Stefan Hajnoczi, 2013/01/18
- Re: [Qemu-devel] [PULL for-1.4 0/8] Block patches, Anthony Liguori, 2013/01/20