From nobody Wed Nov 12 10:13:01 2025 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=1569592474; cv=none; d=zoho.com; s=zohoarc; b=FtPT8ST/sMdKhgzCk+oRVhPgkqtVDCdCkzttA/5oEMbSvicOjvfKxSgnm4sCnY7GIA1uOECoUP0BryfE/k9K0g4F2i1yd3b+cwLIKO8kCE3Qq2cLfq1ex2egQcX8g/yuMMEs47cEjWtH+I3ZGZ4kpoPAKSssbyNz4/JfGymfezg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569592474; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=8/n13dWxOjP4sGAixCkSPIjmiI/8VpL/mCqkicpNbwA=; b=Q+d61RSgZjqTMxayED8u4SIIXDCrW83UC7r7nUCkPp5osTsRHBDEzjMNXD6gPPpxtMYf3yiOq/PSTPw27l+s4Z7HK71tbNmiMa7FCG6jsuD8f3QLzyh2uYoiAfLVcrGBSY1j8oIUQlH4HwHkarg8/9XEv5/RWgZ53X6RgzyMkd4= 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 1569592474941252.11108697758175; Fri, 27 Sep 2019 06:54:34 -0700 (PDT) Received: from localhost ([::1]:51044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDqhd-00082Z-AX for importer@patchew.org; Fri, 27 Sep 2019 09:54:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57299) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iDpuq-0005Cu-Hu for qemu-devel@nongnu.org; Fri, 27 Sep 2019 09:04:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iDpuo-0004EO-Vc for qemu-devel@nongnu.org; Fri, 27 Sep 2019 09:04:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45304) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iDpum-0004DC-E7 for qemu-devel@nongnu.org; Fri, 27 Sep 2019 09:04:06 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A52C0796FC for ; Fri, 27 Sep 2019 09:59:50 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-55.ams2.redhat.com [10.36.112.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id ABBC460A9F; Fri, 27 Sep 2019 09:59:47 +0000 (UTC) From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 11/11] qcrypto-luks: more rigorous header checking Date: Fri, 27 Sep 2019 10:59:26 +0100 Message-Id: <20190927095926.22230-12-berrange@redhat.com> In-Reply-To: <20190927095926.22230-1-berrange@redhat.com> References: <20190927095926.22230-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Fri, 27 Sep 2019 09:59:50 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Maxim Levitsky Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Maxim Levitsky 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 doesn't really matter. Signed-off-by: Maxim Levitsky Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Daniel P. Berrang=C3=A9 --- crypto/block-luks.c | 52 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/crypto/block-luks.c b/crypto/block-luks.c index a53d5d1916..4861db810c 100644 --- a/crypto/block-luks.c +++ b/crypto/block-luks.c @@ -530,6 +530,11 @@ qcrypto_block_luks_load_header(QCryptoBlock *block, static int qcrypto_block_luks_check_header(const QCryptoBlockLUKS *luks, Error **errp) { + size_t i, j; + + unsigned int header_sectors =3D QCRYPTO_BLOCK_LUKS_KEY_SLOT_OFFSET / + QCRYPTO_BLOCK_LUKS_SECTOR_SIZE; + if (memcmp(luks->header.magic, qcrypto_block_luks_magic, QCRYPTO_BLOCK_LUKS_MAGIC_LEN) !=3D 0) { error_setg(errp, "Volume is not in LUKS format"); @@ -541,6 +546,53 @@ qcrypto_block_luks_check_header(const QCryptoBlockLUKS= *luks, Error **errp) luks->header.version); return -1; } + + /* Check all keyslots for corruption */ + for (i =3D 0 ; i < QCRYPTO_BLOCK_LUKS_NUM_KEY_SLOTS ; i++) { + + const QCryptoBlockLUKSKeySlot *slot1 =3D &luks->header.key_slots[i= ]; + unsigned int start1 =3D slot1->key_offset_sector; + unsigned int len1 =3D + qcrypto_block_luks_splitkeylen_sectors(luks, + header_sectors, + slot1->stripes); + + if (slot1->stripes =3D=3D 0) { + error_setg(errp, "Keyslot %zu is corrupted (stripes =3D=3D 0)"= , i); + return -1; + } + + if (slot1->active !=3D QCRYPTO_BLOCK_LUKS_KEY_SLOT_DISABLED && + slot1->active !=3D QCRYPTO_BLOCK_LUKS_KEY_SLOT_ENABLED) { + error_setg(errp, + "Keyslot %zu state (active/disable) is corrupted", = i); + return -1; + } + + if (start1 + len1 > luks->header.payload_offset_sector) { + error_setg(errp, + "Keyslot %zu is overlapping with the encrypted payl= oad", + i); + return -1; + } + + for (j =3D i + 1 ; j < QCRYPTO_BLOCK_LUKS_NUM_KEY_SLOTS ; j++) { + const QCryptoBlockLUKSKeySlot *slot2 =3D &luks->header.key_slo= ts[j]; + unsigned int start2 =3D slot2->key_offset_sector; + unsigned int len2 =3D + qcrypto_block_luks_splitkeylen_sectors(luks, + header_sectors, + slot2->stripes); + + if (start1 + len1 > start2 && start2 + len2 > start1) { + error_setg(errp, + "Keyslots %zu and %zu are overlapping in the he= ader", + i, j); + return -1; + } + } + + } return 0; } =20 --=20 2.21.0