Blame SOURCES/kvm-qemu-img-Use-only-string-options-in-img_open_opts.patch

357786
From b7988ef42d1a3b892c8b3cc99ad7782f2dc3e05c Mon Sep 17 00:00:00 2001
357786
From: Max Reitz <mreitz@redhat.com>
357786
Date: Mon, 25 Jun 2018 13:06:56 +0200
357786
Subject: [PATCH 38/54] qemu-img: Use only string options in img_open_opts
357786
357786
RH-Author: Max Reitz <mreitz@redhat.com>
357786
Message-id: <20180618163106.23010-3-mreitz@redhat.com>
357786
Patchwork-id: 80774
357786
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH 2/3] qemu-img: Use only string options in img_open_opts
357786
Bugzilla: 1576598
357786
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
357786
RH-Acked-by: Fam Zheng <famz@redhat.com>
357786
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
357786
357786
img_open_opts() takes a QemuOpts and converts them to a QDict, so all
357786
values therein are strings.  Then it may try to call qdict_get_bool(),
357786
however, which will fail with a segmentation fault every time:
357786
357786
$ ./qemu-img info -U --image-opts \
357786
    driver=file,filename=/dev/null,force-share=off
357786
[1]    27869 segmentation fault (core dumped)  ./qemu-img info -U
357786
--image-opts driver=file,filename=/dev/null,force-share=off
357786
357786
Fix this by using qdict_get_str() and comparing the value as a string.
357786
Also, when adding a force-share value to the QDict, add it as a string
357786
so it fits the rest of the dict.
357786
357786
Cc: qemu-stable@nongnu.org
357786
Signed-off-by: Max Reitz <mreitz@redhat.com>
357786
Message-id: 20180502202051.15493-3-mreitz@redhat.com
357786
Reviewed-by: Eric Blake <eblake@redhat.com>
357786
Signed-off-by: Max Reitz <mreitz@redhat.com>
357786
(cherry picked from commit 4615f87832d2fcb7a544bedeece2741bf8c21f94)
357786
Signed-off-by: Max Reitz <mreitz@redhat.com>
357786
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
357786
---
357786
 qemu-img.c | 4 ++--
357786
 1 file changed, 2 insertions(+), 2 deletions(-)
357786
357786
diff --git a/qemu-img.c b/qemu-img.c
357786
index 62b29e7..60e45ec 100644
357786
--- a/qemu-img.c
357786
+++ b/qemu-img.c
357786
@@ -277,12 +277,12 @@ static BlockBackend *img_open_opts(const char *optstr,
357786
     options = qemu_opts_to_qdict(opts, NULL);
357786
     if (force_share) {
357786
         if (qdict_haskey(options, BDRV_OPT_FORCE_SHARE)
357786
-            && !qdict_get_bool(options, BDRV_OPT_FORCE_SHARE)) {
357786
+            && strcmp(qdict_get_str(options, BDRV_OPT_FORCE_SHARE), "on")) {
357786
             error_report("--force-share/-U conflicts with image options");
357786
             qobject_unref(options);
357786
             return NULL;
357786
         }
357786
-        qdict_put_bool(options, BDRV_OPT_FORCE_SHARE, true);
357786
+        qdict_put_str(options, BDRV_OPT_FORCE_SHARE, "on");
357786
     }
357786
     blk = blk_new_open(NULL, NULL, options, flags, &local_err);
357786
     if (!blk) {
357786
-- 
357786
1.8.3.1
357786