[{"id":1769625,"web_url":"http://patchwork.ozlabs.org/comment/1769625/","msgid":"","list_archive_url":null,"date":"2017-09-16T17:13:20","subject":"Re: [Qemu-devel] [PATCH v3 6/7] block: convert\n\tqcrypto_block_encrypt|decrypt to take bytes offset","submitter":{"id":36836,"url":"http://patchwork.ozlabs.org/api/people/36836/","name":"Max Reitz","email":"mreitz@redhat.com"},"content":"On 2017-09-12 13:28, Daniel P. Berrange wrote:\n> Instead of sector offset, take the bytes offset when encrypting\n> or decrypting data.\n> \n> Signed-off-by: Daniel P. Berrange \n> ---\n> block/crypto.c | 12 ++++--------\n> block/qcow.c | 7 +++++--\n> block/qcow2-cluster.c | 8 +++-----\n> block/qcow2.c | 4 ++--\n> crypto/block-luks.c | 12 ++++++++----\n> crypto/block-qcow.c | 12 ++++++++----\n> crypto/block.c | 20 ++++++++++++++------\n> crypto/blockpriv.h | 4 ++--\n> include/crypto/block.h | 14 ++++++++------\n> 9 files changed, 54 insertions(+), 39 deletions(-)\n\n[...]\n\n> diff --git a/block/qcow.c b/block/qcow.c\n> index f450b00cfc..d242301ed2 100644\n> --- a/block/qcow.c\n> +++ b/block/qcow.c\n> @@ -478,7 +478,9 @@ static int get_cluster_offset(BlockDriverState *bs,\n> for(i = 0; i < s->cluster_sectors; i++) {\n> if (i < n_start || i >= n_end) {\n> memset(s->cluster_data, 0x00, 512);\n> - if (qcrypto_block_encrypt(s->crypto, start_sect + i,\n> + if (qcrypto_block_encrypt(s->crypto,\n> + (start_sect + i) *\n> + BDRV_SECTOR_SIZE,\n> s->cluster_data,\n> BDRV_SECTOR_SIZE,\n> NULL) < 0) {\n> @@ -668,7 +670,8 @@ static coroutine_fn int qcow_co_readv(BlockDriverState *bs, int64_t sector_num,\n> }\n> if (bs->encrypted) {\n> assert(s->crypto);\n> - if (qcrypto_block_decrypt(s->crypto, sector_num, buf,\n> + if (qcrypto_block_decrypt(s->crypto,\n> + sector_num * BDRV_SECTOR_SIZE, buf,\n> n * BDRV_SECTOR_SIZE, NULL) < 0) {\n> ret = -EIO;\n> break;\n\nThere's another instance of qcrypto_block_encrypt() in qcow_co_writev()\nthat needs to be changed.\n\nMax","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx08.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=mreitz@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xvf4m6xz7z9s7G\n\tfor ;\n\tSun, 17 Sep 2017 03:13:59 +1000 (AEST)","from localhost ([::1]:58090 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dtGfC-0004Uj-9c\n\tfor incoming@patchwork.ozlabs.org; Sat, 16 Sep 2017 13:13:54 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:33282)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dtGep-0004TE-Na\n\tfor qemu-devel@nongnu.org; Sat, 16 Sep 2017 13:13:32 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dtGeo-0003M9-Pn\n\tfor qemu-devel@nongnu.org; Sat, 16 Sep 2017 13:13:31 -0400","from mx1.redhat.com ([209.132.183.28]:43816)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dtGej-0003Jt-CR; Sat, 16 Sep 2017 13:13:25 -0400","from smtp.corp.redhat.com\n\t(int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 4CB88C0587D3;\n\tSat, 16 Sep 2017 17:13:24 +0000 (UTC)","from dresden.str.redhat.com (ovpn-204-52.brq.redhat.com\n\t[10.40.204.52])\n\tby smtp.corp.redhat.com (Postfix) with ESMTPS id 7C6A05D722;\n\tSat, 16 Sep 2017 17:13:22 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 4CB88C0587D3","To":"\"Daniel P. Berrange\" , qemu-devel@nongnu.org","References":"<20170912112855.24269-1-berrange@redhat.com>\n\t<20170912112855.24269-7-berrange@redhat.com>","From":"Max Reitz ","Message-ID":"","Date":"Sat, 16 Sep 2017 19:13:20 +0200","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101\n\tThunderbird/52.3.0","MIME-Version":"1.0","In-Reply-To":"<20170912112855.24269-7-berrange@redhat.com>","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\";\n\tboundary=\"VOCjrngj2WRoPmTqfIUsPSD1sdqHfiqGp\"","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.14","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.32]);\n\tSat, 16 Sep 2017 17:13:24 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","X-Content-Filtered-By":"Mailman/MimeDel 2.1.21","Subject":"Re: [Qemu-devel] [PATCH v3 6/7] block: convert\n\tqcrypto_block_encrypt|decrypt to take bytes offset","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Kevin Wolf , Stefan Hajnoczi ,\n\tqemu-block@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]