From nobody Mon Feb 9 09:51:56 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1565814397; cv=none; d=zoho.com; s=zohoarc; b=BrILBvhHZucQVcm+1JxVuqEw1ef1CieGbXFxakWpuCteXBdtV/bXOmylc33tMRSZ34yZUPRc/50xxu9SWfTzzJPF5o/UojbF2X8uBca6hBQPCooq0ZEby6n8FxLtmRXsraRtA4jW5qMlt5gE0Bb0TQhSLl3Jp7KOyNk/XV+xehY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1565814397; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=S5qqCBGcX5FSvbRA30BEb6cufZOPDwC7JOqvcuHptV0=; b=PzhyQW964EDmtorn4rbSUrqVEL5+OVzHGw4nmGYHY4Nka5Lpf0NI+Qd7vHThT5ocu8c1RA4yUw5RwGN4uvxF7AITlNaifa/n7ugKUhywQ70sXwaJdUkkcBdUkX6xM78c5dPkCXsX32F4R1Nh/Bdh5dJbd3k7BvsUez5B9QgFjTY= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1565814397193392.6623188868348; Wed, 14 Aug 2019 13:26:37 -0700 (PDT) Received: from localhost ([::1]:35704 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxzqM-0006Pa-CQ for importer@patchew.org; Wed, 14 Aug 2019 16:26:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33257) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1hxznS-0004AL-S9 for qemu-devel@nongnu.org; Wed, 14 Aug 2019 16:23:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hxznQ-00045g-My for qemu-devel@nongnu.org; Wed, 14 Aug 2019 16:23:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37244) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hxznJ-0003y4-2V; Wed, 14 Aug 2019 16:22:54 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D5EB6302C07B; Wed, 14 Aug 2019 20:22:47 +0000 (UTC) Received: from maximlenovopc.usersys.redhat.com (unknown [10.35.206.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id E046910016EB; Wed, 14 Aug 2019 20:22:42 +0000 (UTC) From: Maxim Levitsky To: qemu-devel@nongnu.org Date: Wed, 14 Aug 2019 23:22:12 +0300 Message-Id: <20190814202219.1870-7-mlevitsk@redhat.com> In-Reply-To: <20190814202219.1870-1-mlevitsk@redhat.com> References: <20190814202219.1870-1-mlevitsk@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Wed, 14 Aug 2019 20:22:47 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Markus Armbruster , Max Reitz , Stefan Hajnoczi , Maxim Levitsky Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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. Signed-off-by: Maxim Levitsky --- crypto/block-luks.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) 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 **errp) { 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(QCryptoBlockLUKS *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); + + if (slot1->stripes =3D=3D 0 || + (slot1->active !=3D QCRYPTO_BLOCK_LUKS_KEY_SLOT_DISABLED && + slot1->active !=3D QCRYPTO_BLOCK_LUKS_KEY_SLOT_ENABLED)) { + + error_setg(errp, "Keyslot %i is corrupted", i); + ret =3D -EINVAL; + goto fail; + } + + if (start1 + len1 > luks->header.payload_offset) { + error_setg(errp, + "Keyslot %i is overlapping with the encrypted paylo= ad", + i); + ret =3D -EINVAL; + goto fail; + } + + for (j =3D i + 1 ; j < QCRYPTO_BLOCK_LUKS_NUM_KEY_SLOTS ; j++) { + + QCryptoBlockLUKSKeySlot *slot2 =3D &luks->header.key_slots[j]; + uint start2 =3D slot2->key_offset; + uint len2 =3D splitkeylen_sectors(luks, slot2->stripes); + + if (start1 + len1 > start2 && start2 + len2 > start1) { + error_setg(errp, + "Keyslots %i and %i are overlapping in the head= er", + i, j); + ret =3D -EINVAL; + goto fail; + } + } + + } return 0; fail: return ret; --=20 2.17.2