yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

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

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