From nobody Wed Nov 12 00:32:09 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=1566828496; cv=none; d=zoho.com; s=zohoarc; b=D6nib0qtEknywBBE02MkulRUFAhzkLtRJH1LVCvRcGKCzVZGbIVcoZu+onMI9hXCufke05g7LjTvGi2/Ksjcf5SbnFx8PpMaKWdygtQUS5c7E0II/5C4nn6xspBRbozWC7esIyXakI2h+zli9WTpANlFq1vgbwcOGgDxf3Tny6k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1566828496; 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=FwPcAk/ynZI/XuylRQszTTO92flqjnn1rPH7UZo2CT0=; b=hCGzxzXYGld+xvTy0/dy5yeLSp5f4nOZVf8Q06MUvE3lrUhwqmRc8ilkFEYxffyFDctG2lFM00syUEy1Wglg8rHwQxifEzPX2e5tyjvNroeykgcCcUmMMHE+E4oGNsxzk3VbwO4ybhMy2Nrj21H+Pkqvb+Q7OGzzJ1yH+JpTNWQ= 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 156682849681428.65444598471379; Mon, 26 Aug 2019 07:08:16 -0700 (PDT) Received: from localhost ([::1]:53272 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2FfL-0005Dc-7D for importer@patchew.org; Mon, 26 Aug 2019 10:08:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38387) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2FQF-0000Ng-30 for qemu-devel@nongnu.org; Mon, 26 Aug 2019 09:52:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i2FQ6-0007P2-KH for qemu-devel@nongnu.org; Mon, 26 Aug 2019 09:52:31 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48782) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i2FQ3-0007M0-Jn; Mon, 26 Aug 2019 09:52:27 -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 E94F78666C; Mon, 26 Aug 2019 13:52:26 +0000 (UTC) Received: from maximlenovopc.usersys.redhat.com (unknown [10.35.206.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 812835D6C8; Mon, 26 Aug 2019 13:52:24 +0000 (UTC) From: Maxim Levitsky To: qemu-devel@nongnu.org Date: Mon, 26 Aug 2019 16:51:02 +0300 Message-Id: <20190826135103.22410-13-mlevitsk@redhat.com> In-Reply-To: <20190826135103.22410-1-mlevitsk@redhat.com> References: <20190826135103.22410-1-mlevitsk@redhat.com> 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.26]); Mon, 26 Aug 2019 13:52:26 +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 v2 12/13] qcrypto-luks: use g_autowipe 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" This patch makes the luks crypto driver use the g_autowipe to erase the mas= ter keys, and the passwords from the memory. Note that this is not a complete solution, since these keys are also presen= t in the chipers, and in the secrets. Some of them still can be erased, at least at driver instance close. Signed-off-by: Maxim Levitsky --- crypto/block-luks.c | 61 ++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 39 deletions(-) diff --git a/crypto/block-luks.c b/crypto/block-luks.c index 6a43d97ce5..db0fb764b4 100644 --- a/crypto/block-luks.c +++ b/crypto/block-luks.c @@ -32,6 +32,7 @@ #include "qemu/uuid.h" =20 #include "qemu/coroutine.h" +#include "autowipe.h" =20 /* * Reference for the LUKS format implemented here is @@ -698,19 +699,18 @@ qcrypto_block_luks_store_key(QCryptoBlock *block, { QCryptoBlockLUKS *luks =3D block->opaque; QCryptoBlockLUKSKeySlot *slot =3D &luks->header.key_slots[slot_idx]; - g_autofree uint8_t *splitkey =3D NULL; + g_autowipe uint8_t *splitkey =3D NULL; size_t splitkeylen; - g_autofree uint8_t *slotkey =3D NULL; + g_autowipe uint8_t *slotkey =3D NULL; g_autoptr(QCryptoCipher) cipher =3D NULL; g_autoptr(QCryptoIVGen) ivgen =3D NULL; Error *local_err =3D NULL; uint64_t iters; - int ret =3D -1; =20 if (qcrypto_random_bytes(slot->salt, QCRYPTO_BLOCK_LUKS_SALT_LEN, errp) < 0) { - goto cleanup; + return -1; } =20 splitkeylen =3D luks->header.master_key_len * slot->stripes; @@ -728,14 +728,14 @@ qcrypto_block_luks_store_key(QCryptoBlock *block, &local_err); if (local_err) { error_propagate(errp, local_err); - goto cleanup; + return -1; } =20 if (iters > (ULLONG_MAX / iter_time)) { error_setg_errno(errp, ERANGE, "PBKDF iterations %llu too large to scale", (unsigned long long)iters); - goto cleanup; + return -1; } =20 /* iter_time was in millis, but count_iters reported for secs */ @@ -745,7 +745,7 @@ qcrypto_block_luks_store_key(QCryptoBlock *block, error_setg_errno(errp, ERANGE, "PBKDF iterations %llu larger than %u", (unsigned long long)iters, UINT32_MAX); - goto cleanup; + return -1; } =20 slot->iterations =3D @@ -764,7 +764,7 @@ qcrypto_block_luks_store_key(QCryptoBlock *block, slot->iterations, slotkey, luks->header.master_key_len, errp) < 0) { - goto cleanup; + return -1; } =20 =20 @@ -777,7 +777,7 @@ qcrypto_block_luks_store_key(QCryptoBlock *block, slotkey, luks->header.master_key_len, errp); if (!cipher) { - goto cleanup; + return -1; } =20 ivgen =3D qcrypto_ivgen_new(luks->ivgen_alg, @@ -786,7 +786,7 @@ qcrypto_block_luks_store_key(QCryptoBlock *block, slotkey, luks->header.master_key_len, errp); if (!ivgen) { - goto cleanup; + return -1; } =20 /* @@ -802,7 +802,7 @@ qcrypto_block_luks_store_key(QCryptoBlock *block, masterkey, splitkey, errp) < 0) { - goto cleanup; + return -1; } =20 /* @@ -815,7 +815,7 @@ qcrypto_block_luks_store_key(QCryptoBlock *block, splitkey, splitkeylen, errp) < 0) { - goto cleanup; + return -1; } =20 /* Write out the slot's master key material. */ @@ -825,25 +825,16 @@ qcrypto_block_luks_store_key(QCryptoBlock *block, splitkey, splitkeylen, opaque, errp) !=3D splitkeylen) { - goto cleanup; + return -1; } =20 slot->active =3D QCRYPTO_BLOCK_LUKS_KEY_SLOT_ENABLED; =20 if (qcrypto_block_luks_store_header(block, writefunc, opaque, errp)) { - goto cleanup; + return -1; } =20 - ret =3D 0; - -cleanup: - if (slotkey) { - memset(slotkey, 0, luks->header.master_key_len); - } - if (splitkey) { - memset(splitkey, 0, splitkeylen); - } - return ret; + return 0; } =20 /* @@ -868,9 +859,9 @@ qcrypto_block_luks_load_key(QCryptoBlock *block, { QCryptoBlockLUKS *luks =3D block->opaque; const QCryptoBlockLUKSKeySlot *slot =3D &luks->header.key_slots[slot_i= dx]; - g_autofree uint8_t *splitkey =3D NULL; + g_autowipe uint8_t *splitkey =3D NULL; size_t splitkeylen; - g_autofree uint8_t *possiblekey =3D NULL; + g_autowipe uint8_t *possiblekey =3D NULL; ssize_t rv; g_autoptr(QCryptoCipher) cipher =3D NULL; uint8_t keydigest[QCRYPTO_BLOCK_LUKS_DIGEST_LEN]; @@ -1059,8 +1050,8 @@ qcrypto_block_luks_open(QCryptoBlock *block, { QCryptoBlockLUKS *luks =3D NULL; int ret =3D 0; - g_autofree uint8_t *masterkey =3D NULL; - g_autofree char *password =3D NULL; + g_autowipe uint8_t *masterkey =3D NULL; + g_autowipe char *password =3D NULL; =20 if (!(flags & QCRYPTO_BLOCK_OPEN_NO_IO)) { if (!options->u.luks.key_secret) { @@ -1151,6 +1142,7 @@ qcrypto_block_luks_open(QCryptoBlock *block, fail: qcrypto_block_free_cipher(block); qcrypto_ivgen_free(block->ivgen); + g_free(luks); return ret; } @@ -1176,11 +1168,11 @@ qcrypto_block_luks_create(QCryptoBlock *block, QCryptoBlockLUKS *luks; QCryptoBlockCreateOptionsLUKS luks_opts; Error *local_err =3D NULL; - g_autofree uint8_t *masterkey =3D NULL; + g_autowipe uint8_t *masterkey =3D NULL; size_t header_sectors; size_t split_key_sectors; size_t i; - g_autofree char *password; + g_autowipe char *password; const char *cipher_alg; const char *cipher_mode; const char *ivgen_alg; @@ -1445,23 +1437,14 @@ qcrypto_block_luks_create(QCryptoBlock *block, goto error; } =20 - - memset(masterkey, 0, luks->header.master_key_len); return 0; - error: - if (masterkey) { - memset(masterkey, 0, luks->header.master_key_len); - } - qcrypto_block_free_cipher(block); qcrypto_ivgen_free(block->ivgen); - g_free(luks); return -1; } =20 - static int qcrypto_block_luks_get_info(QCryptoBlock *block, QCryptoBlockInfo *info, Error **errp) --=20 2.17.2