[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 42/93] block: fix backing file segfault
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 42/93] block: fix backing file segfault |
Date: |
Fri, 24 Jan 2014 18:21:25 +0100 |
From: Peter Feiner <address@hidden>
When a backing file is opened such that (1) a protocol is directly
used as the block driver and (2) the block driver has bdrv_file_open,
bdrv_open_backing_file segfaults. The problem arises because
bdrv_open_common returns without setting bd->backing_hd->file.
To effect (1), you seem to have to use the -F flag in qemu-img. There
are several block drivers that satisfy (2), such as "file" and "nbd".
Here are some concrete examples:
#!/bin/bash
echo Test file format
./qemu-img create -f file base.file 1m
./qemu-img create -f qcow2 -F file -o backing_file=base.file\
file-overlay.qcow2
./qemu-img convert -O raw file-overlay.qcow2 file-convert.raw
echo Test nbd format
SOCK=$PWD/nbd.sock
./qemu-img create -f raw base.raw 1m
./qemu-nbd -t -k $SOCK base.raw &
trap "kill $!" EXIT
while ! test -e $SOCK; do sleep 1; done
./qemu-img create -f qcow2 -F nbd -o backing_file=nbd:unix:$SOCK\
nbd-overlay.qcow2
./qemu-img convert -O raw nbd-overlay.qcow2 nbd-convert.raw
Without this patch, the two qemu-img convert commands segfault.
This is a regression that was introduced in v1.7 by
dbecebddfa4932d1c83915bcb9b5ba5984eb91be.
Signed-off-by: Peter Feiner <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index 6af5f6e..53cc9e0 100644
--- a/block.c
+++ b/block.c
@@ -1040,8 +1040,12 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict
*options, Error **errp)
error_free(local_err);
return ret;
}
- pstrcpy(bs->backing_file, sizeof(bs->backing_file),
- bs->backing_hd->file->filename);
+
+ if (bs->backing_hd->file) {
+ pstrcpy(bs->backing_file, sizeof(bs->backing_file),
+ bs->backing_hd->file->filename);
+ }
+
return 0;
}
--
1.8.1.4
- [Qemu-devel] [PULL 31/93] blockdev: Move "file" to legacy_opts, (continued)
- [Qemu-devel] [PULL 31/93] blockdev: Move "file" to legacy_opts, Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 34/93] blkverify: Don't require protocol filename, Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 35/93] qapi: Add "errno" to the list of polluted words, Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 33/93] blkverify: Allow command-line configuration, Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 36/93] qapi: QMP interface for blkdebug and blkverify, Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 37/93] qemu-io: Make filename optional, Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 39/93] tests: Add test for qdict_flatten(), Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 40/93] iotests: Test new blkdebug/blkverify interface, Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 38/93] tests: Add test for qdict_array_split(), Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 41/93] iotests: Test file format nesting, Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 42/93] block: fix backing file segfault,
Kevin Wolf <=
- [Qemu-devel] [PULL 43/93] dataplane: fix shadowed return value, Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 44/93] qcow2: fix wrong value of L1E_OFFSET_MASK, L2E_OFFSET_MASK and REFT_OFFSET_MASK, Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 45/93] vmdk: Check for overhead when opening, Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 46/93] qemu-progress: Drop unused include, Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 47/93] qemu-progress: Fix progress printing on SIGUSR1, Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 49/93] sheepdog: fix 'qemu-img map', Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 48/93] Documentation: qemu-img: Mention SIGUSR1 progress report, Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 51/93] vmdk: Fix format specific information (create type) for streamOptimized, Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 50/93] drive mirror:fix memory leak, Kevin Wolf, 2014/01/24
- [Qemu-devel] [PULL 52/93] qapi: Add "backing" to BlockStats, Kevin Wolf, 2014/01/24