From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52148) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fpvLe-0004fh-S5 for qemu-devel@nongnu.org; Wed, 15 Aug 2018 08:56:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fpvLc-0001HA-64 for qemu-devel@nongnu.org; Wed, 15 Aug 2018 08:56:25 -0400 From: Kevin Wolf Date: Wed, 15 Aug 2018 14:55:29 +0200 Message-Id: <20180815125537.10651-14-kwolf@redhat.com> In-Reply-To: <20180815125537.10651-1-kwolf@redhat.com> References: <20180815125537.10651-1-kwolf@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 13/21] qemu-img: fix regression copying secrets during convert List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org From: Daniel P. Berrang=C3=A9 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 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=C3=A9 Signed-off-by: Kevin Wolf --- qemu-img.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index 1acddf693c..b12f4cd19b 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -345,21 +345,6 @@ static int img_add_key_secrets(void *opaque, return 0; } =20 -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 =3D NULL; - - options =3D qdict_new(); - qemu_opt_foreach(create_opts, img_add_key_secrets, options, &error_a= bort); - - return img_open_file(filename, options, fmt, flags, writethrough, qu= iet, - force_share); -} - =20 static BlockBackend *img_open(bool image_opts, const char *filename, @@ -2018,6 +2003,7 @@ static int img_convert(int argc, char **argv) BlockDriverState *out_bs; QemuOpts *opts =3D NULL, *sn_opts =3D NULL; QemuOptsList *create_opts =3D NULL; + QDict *open_opts =3D NULL; char *options =3D NULL; Error *local_err =3D NULL; bool writethrough, src_writethrough, quiet =3D false, image_opts =3D= false, @@ -2362,6 +2348,16 @@ static int img_convert(int argc, char **argv) } } =20 + /* + * 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 =3D qdict_new(); + qemu_opt_foreach(opts, img_add_key_secrets, open_opts, &error_ab= ort); + } + if (!skip_create) { /* Create the new image */ ret =3D bdrv_create(drv, out_filename, opts, &local_err); @@ -2388,8 +2384,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 =3D img_open_new_file(out_filename, opts, out_fmt, - flags, writethrough, quiet, false); + s.target =3D img_open_file(out_filename, open_opts, out_fmt, + flags, writethrough, quiet, false); + open_opts =3D NULL; /* blk_new_open will have freed it */ } if (!s.target) { ret =3D -1; @@ -2464,6 +2461,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 =3D 0; bs_i < s.src_num; bs_i++) { --=20 2.13.6