49 lines
2.0 KiB
Diff
49 lines
2.0 KiB
Diff
|
From a8a7fe80f036d584ffed21f9d2ddb65d269bc805 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Max Reitz <mreitz@redhat.com>
|
||
|
|
Date: Wed, 2 May 2018 22:20:50 +0200
|
||
|
|
Subject: [PATCH] qemu-img: Use only string options in img_open_opts
|
||
|
|
|
||
|
|
img_open_opts() takes a QemuOpts and converts them to a QDict, so all
|
||
|
|
values therein are strings. Then it may try to call qdict_get_bool(),
|
||
|
|
however, which will fail with a segmentation fault every time:
|
||
|
|
|
||
|
|
$ ./qemu-img info -U --image-opts \
|
||
|
|
driver=file,filename=/dev/null,force-share=off
|
||
|
|
[1] 27869 segmentation fault (core dumped) ./qemu-img info -U
|
||
|
|
--image-opts driver=file,filename=/dev/null,force-share=off
|
||
|
|
|
||
|
|
Fix this by using qdict_get_str() and comparing the value as a string.
|
||
|
|
Also, when adding a force-share value to the QDict, add it as a string
|
||
|
|
so it fits the rest of the dict.
|
||
|
|
|
||
|
|
Cc: qemu-stable@nongnu.org
|
||
|
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
||
|
|
Message-id: 20180502202051.15493-3-mreitz@redhat.com
|
||
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
||
|
|
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
||
|
|
(cherry picked from commit 4615f87832d2fcb7a544bedeece2741bf8c21f94)
|
||
|
|
Signed-off-by: Bruce Rogers <brogers@suse.com>
|
||
|
|
---
|
||
|
|
qemu-img.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/qemu-img.c b/qemu-img.c
|
||
|
|
index 855fa52514..42b60917b0 100644
|
||
|
|
--- a/qemu-img.c
|
||
|
|
+++ b/qemu-img.c
|
||
|
|
@@ -277,12 +277,12 @@ static BlockBackend *img_open_opts(const char *optstr,
|
||
|
|
options = qemu_opts_to_qdict(opts, NULL);
|
||
|
|
if (force_share) {
|
||
|
|
if (qdict_haskey(options, BDRV_OPT_FORCE_SHARE)
|
||
|
|
- && !qdict_get_bool(options, BDRV_OPT_FORCE_SHARE)) {
|
||
|
|
+ && strcmp(qdict_get_str(options, BDRV_OPT_FORCE_SHARE), "on")) {
|
||
|
|
error_report("--force-share/-U conflicts with image options");
|
||
|
|
QDECREF(options);
|
||
|
|
return NULL;
|
||
|
|
}
|
||
|
|
- qdict_put_bool(options, BDRV_OPT_FORCE_SHARE, true);
|
||
|
|
+ qdict_put_str(options, BDRV_OPT_FORCE_SHARE, "on");
|
||
|
|
}
|
||
|
|
blk = blk_new_open(NULL, NULL, options, flags, &local_err);
|
||
|
|
if (!blk) {
|