From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58946) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YVdfB-0000Aa-JY for qemu-devel@nongnu.org; Wed, 11 Mar 2015 06:14:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YVdf8-00070L-98 for qemu-devel@nongnu.org; Wed, 11 Mar 2015 06:14:53 -0400 Date: Wed, 11 Mar 2015 11:14:46 +0100 From: Kevin Wolf Message-ID: <20150311101446.GB6628@noname.str.redhat.com> References: <1426008400-22016-1-git-send-email-armbru@redhat.com> <1426008400-22016-2-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1426008400-22016-2-git-send-email-armbru@redhat.com> Subject: Re: [Qemu-devel] [PATCH RFC 1/2] block: Limit opening of encrypted images to qemu-img List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: stefanha@redhat.com, qemu-devel@nongnu.org, qemu-block@nongnu.org, kraxel@redhat.com Am 10.03.2015 um 18:26 hat Markus Armbruster geschrieben: > Signed-off-by: Markus Armbruster > --- > block/qcow.c | 5 +++++ > block/qcow2.c | 5 +++++ > include/block/block.h | 3 +-- > qemu-img.c | 1 + > 4 files changed, 12 insertions(+), 2 deletions(-) > > diff --git a/block/qcow.c b/block/qcow.c > index 0558969..f54fc86 100644 > --- a/block/qcow.c > +++ b/block/qcow.c > @@ -155,6 +155,11 @@ static int qcow_open(BlockDriverState *bs, QDict *options, int flags, > } > s->crypt_method_header = header.crypt_method; > if (s->crypt_method_header) { > + if (!(flags & BDRV_O_CRYPT_OK)) { > + error_setg(errp, "image is encrypted, use qemu-img to decrypt it"); > + ret = -EINVAL; > + goto fail; > + } > bs->encrypted = 1; > } > s->cluster_bits = header.cluster_bits; > diff --git a/block/qcow2.c b/block/qcow2.c > index 50e0a94..b12c67a 100644 > --- a/block/qcow2.c > +++ b/block/qcow2.c > @@ -693,6 +693,11 @@ static int qcow2_open(BlockDriverState *bs, QDict *options, int flags, > } > s->crypt_method_header = header.crypt_method; > if (s->crypt_method_header) { > + if (!(flags & BDRV_O_CRYPT_OK)) { > + error_setg(errp, "image is encrypted, use qemu-img to decrypt it"); > + ret = -EINVAL; > + goto fail; > + } > bs->encrypted = 1; > } Can we do this in bdrv_open_common() instead of duplicating the code in two drivers? Kevin