From c8b73d0f85b2435aabbdec92452cb7a0446b1d36 Mon Sep 17 00:00:00 2001

From: Kevin Wolf <kwolf@redhat.com>

Date: Mon, 3 Sep 2018 09:41:40 +0200

Subject: [PATCH 27/29] qemu-img: fix regression copying secrets during convert

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

RH-Author: Kevin Wolf <kwolf@redhat.com>

Message-id: <20180903094140.12988-2-kwolf@redhat.com>

Patchwork-id: 82031

O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH 1/1] qemu-img: fix regression copying secrets during convert

Bugzilla: 1575578

RH-Acked-by: Max Reitz <mreitz@redhat.com>

RH-Acked-by: Daniel P. Berrange <berrange@redhat.com>

RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>

From: Daniel P. Berrangé <berrange@redhat.com>

When the convert command is creating an output file that needs

secrets, we need to ensure those secrets are passed to both the

blk_new_open and bdrv_create API calls.

This is done by qemu-img extracting all opts matching the name

suffix "key-secret". Unfortunately the code doing this was run after the

call to bdrv_create(), which meant the QemuOpts it was extracting

secrets from was now empty.

Previously this worked by luks as a bug meant the "key-secret"

parameters were not purged from the QemuOpts. This bug was fixed in

  commit b76b4f604521e59f857d6177bc55f6f2e41fd392

  Author: Kevin Wolf <kwolf@redhat.com>

  Date:   Thu Jan 11 16:18:08 2018 +0100

    qcow2: Use visitor for options in qcow2_create()

Exposing the latent bug in qemu-img. This fix simply moves the copying

of secrets to before the bdrv_create() call.

Cc: qemu-stable@nongnu.org

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

(cherry picked from commit 8d65a3ccfd5db7f0436e095cd952f5d0c3a873ba)

Signed-off-by: Kevin Wolf <kwolf@redhat.com>

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 qemu-img.c | 32 +++++++++++++++-----------------

 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/qemu-img.c b/qemu-img.c

index f42750a..fa0cbd7 100644

--- a/qemu-img.c

+++ b/qemu-img.c

@@ -348,21 +348,6 @@ static int img_add_key_secrets(void *opaque,

     return 0;

 }

-static BlockBackend *img_open_new_file(const char *filename,

-                                       QemuOpts *create_opts,

-                                       const char *fmt, int flags,

-                                       bool writethrough, bool quiet,

-                                       bool force_share)

-{

-    QDict *options = NULL;

-

-    options = qdict_new();

-    qemu_opt_foreach(create_opts, img_add_key_secrets, options, &error_abort);

-

-    return img_open_file(filename, options, fmt, flags, writethrough, quiet,

-                         force_share);

-}

-

 static BlockBackend *img_open(bool image_opts,

                               const char *filename,

@@ -1994,6 +1979,7 @@ static int img_convert(int argc, char **argv)

     BlockDriverState *out_bs;

     QemuOpts *opts = NULL, *sn_opts = NULL;

     QemuOptsList *create_opts = NULL;

+    QDict *open_opts = NULL;

     char *options = NULL;

     Error *local_err = NULL;

     bool writethrough, src_writethrough, quiet = false, image_opts = false,

@@ -2342,6 +2328,16 @@ static int img_convert(int argc, char **argv)

         }

     }

+    /*

+     * The later open call will need any decryption secrets, and

+     * bdrv_create() will purge "opts", so extract them now before

+     * they are lost.

+     */

+    if (!skip_create) {

+        open_opts = qdict_new();

+        qemu_opt_foreach(opts, img_add_key_secrets, open_opts, &error_abort);

+    }

+

     if (!skip_create) {

         /* Create the new image */

         ret = bdrv_create(drv, out_filename, opts, &local_err);

@@ -2368,8 +2364,9 @@ static int img_convert(int argc, char **argv)

          * That has to wait for bdrv_create to be improved

          * to allow filenames in option syntax

          */

-        s.target = img_open_new_file(out_filename, opts, out_fmt,

-                                     flags, writethrough, quiet, false);

+        s.target = img_open_file(out_filename, open_opts, out_fmt,

+                                 flags, writethrough, quiet, false);

+        open_opts = NULL; /* blk_new_open will have freed it */

     }

     if (!s.target) {

         ret = -1;

@@ -2437,6 +2434,7 @@ out:

     qemu_opts_del(opts);

     qemu_opts_free(create_opts);

     qemu_opts_del(sn_opts);

+    qobject_unref(open_opts);

     blk_unref(s.target);

     if (s.src) {

         for (bs_i = 0; bs_i < s.src_num; bs_i++) {

-- 

1.8.3.1