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=-6.8 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 F3946C3A5A1 for ; Sun, 25 Aug 2019 16:09:41 +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 C287C206DD for ; Sun, 25 Aug 2019 16:09:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C287C206DD 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]:43566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i1v5H-0005q3-17 for qemu-devel@archiver.kernel.org; Sun, 25 Aug 2019 12:09:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60407) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i1v3s-0005Du-2N for qemu-devel@nongnu.org; Sun, 25 Aug 2019 12:08:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i1v3r-0002sb-0J for qemu-devel@nongnu.org; Sun, 25 Aug 2019 12:08:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34158) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i1v3o-0002rK-8J; Sun, 25 Aug 2019 12:08:08 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D4C51180158C; Sun, 25 Aug 2019 16:08:06 +0000 (UTC) Received: from maximlenovopc.usersys.redhat.com (unknown [10.35.206.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF2EB60BEC; Sun, 25 Aug 2019 16:08:01 +0000 (UTC) Message-ID: From: Maxim Levitsky To: "Daniel P." =?ISO-8859-1?Q?Berrang=E9?= Date: Sun, 25 Aug 2019 19:08:00 +0300 In-Reply-To: References: <20190814202219.1870-1-mlevitsk@redhat.com> <20190814202219.1870-7-mlevitsk@redhat.com> <20190822110448.GK3267@redhat.com> Content-Type: text/plain; charset="UTF-8" Mime-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Sun, 25 Aug 2019 16:08:06 +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 06/13] qcrypto-luks: implement more rigorous header checking 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 Sun, 2019-08-25 at 18:40 +0300, Maxim Levitsky wrote: > On Thu, 2019-08-22 at 12:04 +0100, Daniel P. Berrang=C3=A9 wrote: > > On Wed, Aug 14, 2019 at 11:22:12PM +0300, Maxim Levitsky wrote: > > > Check that keyslots don't overlap with the data, > > > and check that keyslots don't overlap with each other. > > > (this is done using naive O(n^2) nested loops, > > > but since there are just 8 keyslots, this doens't really matter. > > >=20 > > > Signed-off-by: Maxim Levitsky > > > --- > > > crypto/block-luks.c | 42 +++++++++++++++++++++++++++++++++++++++++= + > > > 1 file changed, 42 insertions(+) > > >=20 > > > diff --git a/crypto/block-luks.c b/crypto/block-luks.c > > > index 336e633df4..1997e92fe1 100644 > > > --- a/crypto/block-luks.c > > > +++ b/crypto/block-luks.c > > > @@ -551,6 +551,8 @@ static int > > > qcrypto_block_luks_check_header(QCryptoBlockLUKS *luks, Error **er= rp) > > > { > > > int ret; > > > + int i, j; > > > + > > > =20 > > > if (memcmp(luks->header.magic, qcrypto_block_luks_magic, > > > QCRYPTO_BLOCK_LUKS_MAGIC_LEN) !=3D 0) { > > > @@ -566,6 +568,46 @@ qcrypto_block_luks_check_header(QCryptoBlockLU= KS *luks, Error **errp) > > > goto fail; > > > } > > > =20 > > > + /* Check all keyslots for corruption */ > > > + for (i =3D 0 ; i < QCRYPTO_BLOCK_LUKS_NUM_KEY_SLOTS ; i++) { > > > + > > > + QCryptoBlockLUKSKeySlot *slot1 =3D &luks->header.key_slots= [i]; > > > + uint start1 =3D slot1->key_offset; > > > + uint len1 =3D splitkeylen_sectors(luks, slot1->stripes); > >=20 > > Using 'uint' is not normal QEMU style. > >=20 > > Either use 'unsigned int' or if a specific size is needed > > then one of the 'guintNN' types from glib. > >=20 > > This applies elsewhere in this patch series too, but > > I'll only comment here & let you find the other cases. >=20 > Fixed. Sorry for the noise. >=20 > >=20 > > > + > > > + if (slot1->stripes =3D=3D 0 || > > > + (slot1->active !=3D QCRYPTO_BLOCK_LUKS_KEY_SLOT_DI= SABLED && > > > + slot1->active !=3D QCRYPTO_BLOCK_LUKS_KEY_SLOT_ENA= BLED)) { > > > + > >=20 > > Redundant blank line >=20 > Fixed > >=20 > > > + error_setg(errp, "Keyslot %i is corrupted", i); > >=20 > > I'd do a separate check for stripes and active fields, and then give = a > > specific error message for each. That way if this does ever trigger > > in practice will immediately understand which check failed. > >=20 > > Also using '%d' rather than '%i' is more common convention >=20 > Done. Note that I switched i,j to be size_t since you said that you prefer this= , and to print this I apparently need %lu. [...] Best regards, Maxim Levitsky