From: Maxim Levitsky <mlevitsk@redhat.com> To: qemu-devel@nongnu.org Cc: "Kevin Wolf" <kwolf@redhat.com>, "Fam Zheng" <fam@euphon.net>, "Daniel P. Berrangé" <berrange@redhat.com>, qemu-block@nongnu.org, "Markus Armbruster" <armbru@redhat.com>, "Max Reitz" <mreitz@redhat.com>, "Stefan Hajnoczi" <stefanha@redhat.com>, "Maxim Levitsky" <mlevitsk@redhat.com> Subject: [Qemu-devel] [PATCH 10/13] block/crypto: implement the encryption key management Date: Wed, 14 Aug 2019 23:22:16 +0300 Message-ID: <20190814202219.1870-11-mlevitsk@redhat.com> (raw) In-Reply-To: <20190814202219.1870-1-mlevitsk@redhat.com> This implements the encryption key management using the generic code in qcrypto layer 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 <mlevitsk@redhat.com> --- block/crypto.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 93 insertions(+), 3 deletions(-) diff --git a/block/crypto.c b/block/crypto.c index 42a3f0898b..415b6db041 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -36,6 +36,7 @@ typedef struct BlockCrypto BlockCrypto; struct BlockCrypto { QCryptoBlock *block; + bool updating_keys; }; @@ -69,6 +70,24 @@ static ssize_t block_crypto_read_func(QCryptoBlock *block, return ret; } +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 = opaque; + ssize_t ret; + + ret = bdrv_pwrite(bs->file, offset, buf, buflen); + if (ret < 0) { + error_setg_errno(errp, -ret, "Could not write encryption header"); + return ret; + } + return ret; +} + struct BlockCryptoCreateData { BlockBackend *blk; @@ -622,6 +641,78 @@ block_crypto_get_specific_info_luks(BlockDriverState *bs, Error **errp) return spec_info; } + +static int +block_crypto_setup_encryption(BlockDriverState *bs, + enum BlkSetupEncryptionAction action, + QCryptoEncryptionSetupOptions *options, + bool force, + Error **errp) +{ + BlockCrypto *crypto = bs->opaque; + int ret; + + assert(crypto); + assert(crypto->block); + + crypto->updating_keys = true; + + ret = bdrv_child_refresh_perms(bs, bs->file, errp); + + if (ret) { + crypto->updating_keys = false; + return ret; + } + + ret = qcrypto_block_setup_encryption(crypto->block, + block_crypto_read_func, + block_crypto_write_func, + bs, + action, + options, + force, + errp); + + crypto->updating_keys = false; + bdrv_child_refresh_perms(bs, bs->file, errp); + + + 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 = bs->opaque; + + /* + * This driver doesn't modify LUKS metadata except + * when updating the encryption slots. + * Allow share-rw=on 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 |= BLK_PERM_WRITE; + shared &= ~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[] = { BLOCK_CRYPTO_OPT_LUKS_KEY_SECRET, @@ -634,9 +725,7 @@ static BlockDriver bdrv_crypto_luks = { .bdrv_probe = block_crypto_probe_luks, .bdrv_open = block_crypto_open_luks, .bdrv_close = block_crypto_close, - /* This driver doesn't modify LUKS metadata except when creating image. - * Allow share-rw=on as a special case. */ - .bdrv_child_perm = bdrv_filter_default_perms, + .bdrv_child_perm = block_crypto_child_perms, .bdrv_co_create = block_crypto_co_create_luks, .bdrv_co_create_opts = block_crypto_co_create_opts_luks, .bdrv_co_truncate = block_crypto_co_truncate, @@ -649,6 +738,7 @@ static BlockDriver bdrv_crypto_luks = { .bdrv_getlength = block_crypto_getlength, .bdrv_get_info = block_crypto_get_info_luks, .bdrv_get_specific_info = block_crypto_get_specific_info_luks, + .bdrv_setup_encryption = block_crypto_setup_encryption, .strong_runtime_opts = block_crypto_strong_runtime_opts, }; -- 2.17.2
next prev parent reply index Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-14 20:22 [Qemu-devel] [PATCH 00/13] RFC: luks/encrypted qcow2 " Maxim Levitsky 2019-08-14 20:22 ` [Qemu-devel] [PATCH 01/13] block-crypto: misc refactoring Maxim Levitsky 2019-08-20 16:38 ` Max Reitz 2019-08-22 0:05 ` Maxim Levitsky 2019-08-22 14:34 ` Max Reitz 2019-08-22 15:04 ` Maxim Levitsky 2019-08-21 15:39 ` Daniel P. Berrangé 2019-08-22 0:08 ` Maxim Levitsky 2019-08-14 20:22 ` [Qemu-devel] [PATCH 02/13] qcrypto-luks: " Maxim Levitsky 2019-08-15 21:40 ` [Qemu-devel] [Qemu-block] " John Snow 2019-08-19 14:21 ` Maxim Levitsky 2019-08-22 10:29 ` Daniel P. Berrangé 2019-08-22 11:04 ` Maxim Levitsky 2019-08-22 11:10 ` Daniel P. Berrangé 2019-08-22 11:13 ` Maxim Levitsky 2019-08-20 17:36 ` [Qemu-devel] " Max Reitz 2019-08-21 23:59 ` Maxim Levitsky 2019-08-22 14:32 ` Max Reitz 2019-08-25 10:46 ` Maxim Levitsky 2019-08-14 20:22 ` [Qemu-devel] [PATCH 03/13] qcrypto-luks: refactoring: extract load/store/check/parse header functions Maxim Levitsky 2019-08-20 18:01 ` Max Reitz 2019-08-21 22:43 ` Maxim Levitsky 2019-08-22 10:32 ` Daniel P. Berrangé 2019-08-22 10:57 ` Maxim Levitsky 2019-08-22 10:34 ` Daniel P. Berrangé 2019-08-25 14:11 ` Maxim Levitsky 2019-08-22 10:38 ` Daniel P. Berrangé 2019-08-25 14:09 ` Maxim Levitsky 2019-08-14 20:22 ` [Qemu-devel] [PATCH 04/13] qcrypto-luks: refactoring: simplify the math used for keyslot locations Maxim Levitsky 2019-08-22 10:47 ` Daniel P. Berrangé 2019-08-25 14:30 ` Maxim Levitsky 2019-08-14 20:22 ` [Qemu-devel] [PATCH 05/13] qcrypto-luks: clear the masterkey and password before freeing them always Maxim Levitsky 2019-08-20 18:12 ` Max Reitz 2019-08-21 22:40 ` Maxim Levitsky 2019-08-22 10:49 ` Daniel P. Berrangé 2019-08-22 10:56 ` Maxim Levitsky 2019-08-25 15:31 ` Maxim Levitsky 2019-08-25 17:15 ` Maxim Levitsky 2019-08-27 8:55 ` Daniel P. Berrangé 2019-08-21 23:01 ` [Qemu-devel] [Qemu-block] " Nir Soffer 2019-08-21 23:11 ` Maxim Levitsky 2019-08-14 20:22 ` [Qemu-devel] [PATCH 06/13] qcrypto-luks: implement more rigorous header checking Maxim Levitsky 2019-08-22 11:04 ` Daniel P. Berrangé 2019-08-25 15:40 ` Maxim Levitsky 2019-08-25 16:08 ` Maxim Levitsky 2019-08-26 13:31 ` Eric Blake 2019-08-26 13:39 ` Maxim Levitsky 2019-08-27 8:56 ` Daniel P. Berrangé 2019-08-14 20:22 ` [Qemu-devel] [PATCH 07/13] block: add manage-encryption command (qmp and blockdev) Maxim Levitsky 2019-08-20 18:27 ` Max Reitz 2019-08-21 22:32 ` Maxim Levitsky 2019-08-22 11:14 ` Daniel P. Berrangé 2019-08-21 11:47 ` Markus Armbruster 2019-08-21 22:24 ` Maxim Levitsky 2019-08-22 14:07 ` Markus Armbruster 2019-08-25 16:42 ` Maxim Levitsky 2019-08-14 20:22 ` [Qemu-devel] [PATCH 08/13] qcrypto: add the plumbing for encryption management Maxim Levitsky 2019-08-22 11:16 ` Daniel P. Berrangé 2019-08-22 11:47 ` Maxim Levitsky 2019-08-22 11:49 ` Daniel P. Berrangé 2019-08-14 20:22 ` [Qemu-devel] [PATCH 09/13] qcrypto-luks: implement the encryption key management Maxim Levitsky 2019-08-22 11:27 ` Daniel P. Berrangé 2019-08-25 17:01 ` Maxim Levitsky 2019-08-14 20:22 ` Maxim Levitsky [this message] 2019-08-22 11:29 ` [Qemu-devel] [PATCH 10/13] block/crypto: " Daniel P. Berrangé 2019-08-22 11:36 ` Maxim Levitsky 2019-08-14 20:22 ` [Qemu-devel] [PATCH 11/13] block/qcow2: implement the encryption key managment Maxim Levitsky 2019-08-14 20:22 ` [Qemu-devel] [PATCH 12/13] qemu-img: implement key management Maxim Levitsky 2019-08-20 18:29 ` Max Reitz 2019-08-21 22:33 ` Maxim Levitsky 2019-08-22 11:32 ` Daniel P. Berrangé 2019-08-22 14:42 ` Max Reitz 2019-08-25 17:04 ` Maxim Levitsky 2019-08-14 20:22 ` [Qemu-devel] [PATCH 13/13] iotests : add tests for encryption " Maxim Levitsky 2019-08-14 21:08 ` [Qemu-devel] [PATCH 00/13] RFC: luks/encrypted qcow2 " Eric Blake 2019-08-15 8:49 ` Maxim Levitsky 2019-08-15 9:10 ` Kevin Wolf 2019-08-15 14:18 ` Markus Armbruster 2019-08-15 14:44 ` Maxim Levitsky 2019-08-15 15:00 ` Eric Blake 2019-08-19 12:35 ` Maxim Levitsky 2019-08-21 11:31 ` Markus Armbruster 2019-08-21 13:22 ` Maxim Levitsky 2019-08-20 17:59 ` Max Reitz 2019-08-21 22:00 ` Maxim Levitsky 2019-08-22 11:35 ` Daniel P. Berrangé 2019-08-25 17:10 ` Maxim Levitsky
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190814202219.1870-11-mlevitsk@redhat.com \ --to=mlevitsk@redhat.com \ --cc=armbru@redhat.com \ --cc=berrange@redhat.com \ --cc=fam@euphon.net \ --cc=kwolf@redhat.com \ --cc=mreitz@redhat.com \ --cc=qemu-block@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=stefanha@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
QEMU-Devel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/qemu-devel/0 qemu-devel/git/0.git git clone --mirror https://lore.kernel.org/qemu-devel/1 qemu-devel/git/1.git git clone --mirror https://lore.kernel.org/qemu-devel/2 qemu-devel/git/2.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 qemu-devel qemu-devel/ https://lore.kernel.org/qemu-devel \ qemu-devel@nongnu.org public-inbox-index qemu-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.nongnu.qemu-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git