From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D56E3C5ACAE for ; Thu, 12 Sep 2019 07:42:02 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 86FBA20830 for ; Thu, 12 Sep 2019 07:42:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 86FBA20830 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:58908 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8Jjt-0003wQ-KR for qemu-devel@archiver.kernel.org; Thu, 12 Sep 2019 03:42:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54199) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i8Jig-0002dO-1J for qemu-devel@nongnu.org; Thu, 12 Sep 2019 03:40:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i8Jie-0003KH-QG for qemu-devel@nongnu.org; Thu, 12 Sep 2019 03:40:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53560) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i8Jic-0003J4-50; Thu, 12 Sep 2019 03:40:42 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 714B0821C6; Thu, 12 Sep 2019 07:40:41 +0000 (UTC) Received: from maximlenovopc.usersys.redhat.com (unknown [10.35.206.59]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1EF755D6A5; Thu, 12 Sep 2019 07:40:36 +0000 (UTC) Message-ID: From: Maxim Levitsky To: "Daniel P." =?ISO-8859-1?Q?Berrang=E9?= Date: Thu, 12 Sep 2019 10:40:36 +0300 In-Reply-To: <20190906131758.GH5119@redhat.com> References: <20190826135103.22410-1-mlevitsk@redhat.com> <20190826135103.22410-12-mlevitsk@redhat.com> <20190906131758.GH5119@redhat.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 12 Sep 2019 07:40:41 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: Re: [Qemu-devel] [PATCH v2 11/13] qcrypto-luks: refactoring: simplify the math used for keyslot locations X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Wolf , Fam Zheng , qemu-block@nongnu.org, qemu-devel@nongnu.org, Markus Armbruster , Max Reitz , Stefan Hajnoczi Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, 2019-09-06 at 14:17 +0100, Daniel P. Berrang=C3=A9 wrote: > On Mon, Aug 26, 2019 at 04:51:01PM +0300, Maxim Levitsky wrote: > > Signed-off-by: Maxim Levitsky > > --- > > crypto/block-luks.c | 64 +++++++++++++++++++++++++++++--------------= -- > > 1 file changed, 41 insertions(+), 23 deletions(-) > >=20 > > diff --git a/crypto/block-luks.c b/crypto/block-luks.c > > index d713125925..6a43d97ce5 100644 > > --- a/crypto/block-luks.c > > +++ b/crypto/block-luks.c > > @@ -409,6 +409,32 @@ qcrypto_block_luks_essiv_cipher(QCryptoCipherAlg= orithm cipher, > > } > > } > > =20 > > +/* > > + * Returns number of sectors needed to store the key material > > + * given number of anti forensic stripes > > + */ > > +static int > > +qcrypto_block_luks_splitkeylen_sectors(const QCryptoBlockLUKS *luks, > > + unsigned int stripes) > > +{ > > + /* > > + * This calculation doesn't match that shown in the spec, > > + * but instead follows the cryptsetup implementation. > > + */ > > + > > + size_t header_sectors =3D QCRYPTO_BLOCK_LUKS_KEY_SLOT_OFFSET / > > + QCRYPTO_BLOCK_LUKS_SECTOR_SIZE; >=20 > The caller already calculated that so just pass it in All right, no problem. >=20 > > + > > + size_t splitkeylen =3D luks->header.master_key_len * stripes; > > + > > + /* First align the key material size to block size*/ > > + size_t splitkeylen_sectors =3D > > + DIV_ROUND_UP(splitkeylen, QCRYPTO_BLOCK_LUKS_SECTOR_SIZE); > > + > > + /* Then also align the key material size to the size of the head= er */ > > + return ROUND_UP(splitkeylen_sectors, header_sectors); > > +} > > + > > /* > > * Stores the main LUKS header, taking care of endianess > > */ > > @@ -1151,7 +1177,8 @@ qcrypto_block_luks_create(QCryptoBlock *block, > > QCryptoBlockCreateOptionsLUKS luks_opts; > > Error *local_err =3D NULL; > > g_autofree uint8_t *masterkey =3D NULL; > > - size_t splitkeylen =3D 0; > > + size_t header_sectors; > > + size_t split_key_sectors; > > size_t i; > > g_autofree char *password; > > const char *cipher_alg; > > @@ -1370,37 +1397,28 @@ qcrypto_block_luks_create(QCryptoBlock *block= , > > goto error; > > } > > =20 > > + /* start with the sector that follows the header*/ > > + header_sectors =3D QCRYPTO_BLOCK_LUKS_KEY_SLOT_OFFSET / > > + QCRYPTO_BLOCK_LUKS_SECTOR_SIZE; > > + > > + split_key_sectors =3D > > + qcrypto_block_luks_splitkeylen_sectors(luks, > > + QCRYPTO_BLOCK_LUKS_ST= RIPES); > > =20 > > - /* Although LUKS has multiple key slots, we're just going > > - * to use the first key slot */ > > - splitkeylen =3D luks->header.master_key_len * QCRYPTO_BLOCK_LUKS= _STRIPES; > > for (i =3D 0; i < QCRYPTO_BLOCK_LUKS_NUM_KEY_SLOTS; i++) { > > - luks->header.key_slots[i].active =3D QCRYPTO_BLOCK_LUKS_KEY_= SLOT_DISABLED; > > - luks->header.key_slots[i].stripes =3D QCRYPTO_BLOCK_LUKS_STR= IPES; > > + QCryptoBlockLUKSKeySlot *slot =3D &luks->header.key_slots[i]= ; > > + slot->active =3D QCRYPTO_BLOCK_LUKS_KEY_SLOT_DISABLED; > > =20 > > - /* This calculation doesn't match that shown in the spec, > > - * but instead follows the cryptsetup implementation. > > - */ > > - luks->header.key_slots[i].key_offset_sector =3D > > - (QCRYPTO_BLOCK_LUKS_KEY_SLOT_OFFSET / > > - QCRYPTO_BLOCK_LUKS_SECTOR_SIZE) + > > - (ROUND_UP(DIV_ROUND_UP(splitkeylen, QCRYPTO_BLOCK_LUKS_S= ECTOR_SIZE), > > - (QCRYPTO_BLOCK_LUKS_KEY_SLOT_OFFSET / > > - QCRYPTO_BLOCK_LUKS_SECTOR_SIZE)) * i); > > + slot->key_offset_sector =3D header_sectors + i * split_key_s= ectors; > > + slot->stripes =3D QCRYPTO_BLOCK_LUKS_STRIPES; > > } > > =20 > > - > > /* The total size of the LUKS headers is the partition header + = key > > * slot headers, rounded up to the nearest sector, combined with > > * the size of each master key material region, also rounded up > > * to the nearest sector */ > > - luks->header.payload_offset_sector =3D > > - (QCRYPTO_BLOCK_LUKS_KEY_SLOT_OFFSET / > > - QCRYPTO_BLOCK_LUKS_SECTOR_SIZE) + > > - (ROUND_UP(DIV_ROUND_UP(splitkeylen, QCRYPTO_BLOCK_LUKS_SECTO= R_SIZE), > > - (QCRYPTO_BLOCK_LUKS_KEY_SLOT_OFFSET / > > - QCRYPTO_BLOCK_LUKS_SECTOR_SIZE)) * > > - QCRYPTO_BLOCK_LUKS_NUM_KEY_SLOTS); > > + luks->header.payload_offset_sector =3D header_sectors + > > + QCRYPTO_BLOCK_LUKS_NUM_KEY_SLOTS * split_key_sectors; > > =20 > > block->sector_size =3D QCRYPTO_BLOCK_LUKS_SECTOR_SIZE; > > block->payload_offset =3D luks->header.payload_offset_sector * >=20 > Reviewed-by: Daniel P. Berrang=C3=A9 >=20 > Regards, > Daniel Best regards, Maxim Levitsky