From nobody Wed Nov 12 01:53:56 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=1567198810; cv=none; d=zoho.com; s=zohoarc; b=SwCRruF1eDxE1j+4Hrtswc+5ny36o6uz4mzo52NVcTtHFcEd6GHeg8O0+6boaska91jfcIF2TEP9HvwNvWhSsP6sOXkrfzggqae/wtcvOvxhZ8Mp+YY1plqLY0mAqmohKbb4noGuAQTZ+BAth7PSG5KEZb2HXzAdYyB4x1NJZ2Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1567198810; 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=iH1DXGcsOITVn1Ep535bP0636+tuSGt7akMZwm2DJW0=; b=k/AOwj8ZxYCBPLc9dj0xlo9eyN0V3QYrdVYgY4h/loCMySUz4AXcO0qJHz8xBhim4WoqQSyXlUmgv3fGEPC2vWVQ42bSV3VeBdGTk7NVt/VZY1hu5UH+1iG8MQOUh/LpaAmsTRd4gQ1YS0q7pf6EUiB5+un4h2ngwPk4yI0IKks= 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 1567198810938301.9315904245326; Fri, 30 Aug 2019 14:00:10 -0700 (PDT) Received: from localhost ([::1]:41076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3o09-0005Wd-Db for importer@patchew.org; Fri, 30 Aug 2019 17:00:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47421) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3nwn-0003FJ-BY for qemu-devel@nongnu.org; Fri, 30 Aug 2019 16:56:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i3nwl-0001VH-Rw for qemu-devel@nongnu.org; Fri, 30 Aug 2019 16:56:41 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33900) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i3nwi-0001Rz-TN; Fri, 30 Aug 2019 16:56:37 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3C7B3102700C; Fri, 30 Aug 2019 20:56:36 +0000 (UTC) Received: from maximlenovopc.usersys.redhat.com (unknown [10.35.206.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id A97585D9CA; Fri, 30 Aug 2019 20:56:31 +0000 (UTC) From: Maxim Levitsky To: qemu-devel@nongnu.org Date: Fri, 30 Aug 2019 23:56:03 +0300 Message-Id: <20190830205608.18192-6-mlevitsk@redhat.com> In-Reply-To: <20190830205608.18192-1-mlevitsk@redhat.com> References: <20190830205608.18192-1-mlevitsk@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Fri, 30 Aug 2019 20:56:36 +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 05/10] block/crypto: implement the encryption key management 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 , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , qemu-block@nongnu.org, Markus Armbruster , Max Reitz , Maxim Levitsky , John Snow 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 implements the encryption key management using the generic code in qcrypto layer (currently only for qemu-img amend) This code adds another 'write_func' because the initialization write_func works directly on the underlying file, because during the creation, there is no open instance of the luks driver, but during regular use, we have it, and should use it instead. Signed-off-by: Maxim Levitsky --- block/crypto.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 103 insertions(+), 3 deletions(-) diff --git a/block/crypto.c b/block/crypto.c index a6a3e1f1d8..dbd95a99ba 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -36,6 +36,7 @@ typedef struct BlockCrypto BlockCrypto; =20 struct BlockCrypto { QCryptoBlock *block; + bool updating_keys; }; =20 =20 @@ -70,6 +71,24 @@ static ssize_t block_crypto_read_func(QCryptoBlock *bloc= k, return ret; } =20 +static ssize_t block_crypto_write_func(QCryptoBlock *block, + size_t offset, + const uint8_t *buf, + size_t buflen, + void *opaque, + Error **errp) +{ + BlockDriverState *bs =3D opaque; + ssize_t ret; + + ret =3D bdrv_pwrite(bs->file, offset, buf, buflen); + if (ret < 0) { + error_setg_errno(errp, -ret, "Could not write encryption header"); + return ret; + } + return ret; +} + =20 struct BlockCryptoCreateData { BlockBackend *blk; @@ -647,6 +666,88 @@ block_crypto_get_specific_info_luks(BlockDriverState *= bs, Error **errp) return spec_info; } =20 + +static int +block_crypto_amend_options(BlockDriverState *bs, + QemuOpts *opts, + BlockDriverAmendStatusCB *status_cb, + void *cb_opaque, + bool force, + Error **errp) +{ + BlockCrypto *crypto =3D bs->opaque; + QDict *cryptoopts =3D NULL; + QCryptoBlockCreateOptions *amend_options =3D NULL; + int ret; + + assert(crypto); + assert(crypto->block); + + crypto->updating_keys =3D true; + + ret =3D bdrv_child_refresh_perms(bs, bs->file, errp); + if (ret) { + goto cleanup; + } + + cryptoopts =3D qemu_opts_to_qdict_filtered(opts, NULL, + &block_crypto_create_opts_luk= s, + true); + + qdict_put_str(cryptoopts, "format", "luks"); + amend_options =3D block_crypto_create_opts_init(cryptoopts, errp); + if (!amend_options) { + ret =3D -EINVAL; + goto cleanup; + } + + ret =3D qcrypto_block_amend_options(crypto->block, + block_crypto_read_func, + block_crypto_write_func, + bs, + amend_options, + force, + errp); +cleanup: + crypto->updating_keys =3D false; + bdrv_child_refresh_perms(bs, bs->file, errp); + qapi_free_QCryptoBlockCreateOptions(amend_options); + qobject_unref(cryptoopts); + return ret; +} + + +static void +block_crypto_child_perms(BlockDriverState *bs, BdrvChild *c, + const BdrvChildRole *role, + BlockReopenQueue *reopen_queue, + uint64_t perm, uint64_t shared, + uint64_t *nperm, uint64_t *nshared) +{ + + BlockCrypto *crypto =3D bs->opaque; + + /* + * This driver doesn't modify LUKS metadata except + * when updating the encryption slots. + * Allow share-rw=3Don as a special case. + * + * Encryption update will set the crypto->updating_keys + * during that period and refresh permissions + * + * */ + + if (crypto->updating_keys) { + /*need exclusive write access for header update */ + perm |=3D BLK_PERM_WRITE; + shared &=3D ~BLK_PERM_WRITE; + } + + bdrv_filter_default_perms(bs, c, role, reopen_queue, + perm, shared, nperm, nshared); +} + + static const char *const block_crypto_strong_runtime_opts[] =3D { BLOCK_CRYPTO_OPT_LUKS_KEY_SECRET, =20 @@ -659,9 +760,7 @@ static BlockDriver bdrv_crypto_luks =3D { .bdrv_probe =3D block_crypto_probe_luks, .bdrv_open =3D block_crypto_open_luks, .bdrv_close =3D block_crypto_close, - /* This driver doesn't modify LUKS metadata except when creating image. - * Allow share-rw=3Don as a special case. */ - .bdrv_child_perm =3D bdrv_filter_default_perms, + .bdrv_child_perm =3D block_crypto_child_perms, .bdrv_co_create =3D block_crypto_co_create_luks, .bdrv_co_create_opts =3D block_crypto_co_create_opts_luks, .bdrv_co_truncate =3D block_crypto_co_truncate, @@ -674,6 +773,7 @@ static BlockDriver bdrv_crypto_luks =3D { .bdrv_getlength =3D block_crypto_getlength, .bdrv_get_info =3D block_crypto_get_info_luks, .bdrv_get_specific_info =3D block_crypto_get_specific_info_luks, + .bdrv_amend_options =3D block_crypto_amend_options, =20 .strong_runtime_opts =3D block_crypto_strong_runtime_opts, }; --=20 2.17.2