From patchwork Thu Sep 16 17:49:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 12499819 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-19.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 646FAC433EF for ; Thu, 16 Sep 2021 17:53:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5274661164 for ; Thu, 16 Sep 2021 17:53:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244016AbhIPRzJ (ORCPT ); Thu, 16 Sep 2021 13:55:09 -0400 Received: from mail.kernel.org ([198.145.29.99]:33884 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245694AbhIPRxG (ORCPT ); Thu, 16 Sep 2021 13:53:06 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id A6D0E60EE3; Thu, 16 Sep 2021 17:51:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631814705; bh=bumOv0klWJdO80jt9NdhfqMfqKAU8InvZwEPu1K3Wws=; h=From:To:Cc:Subject:Date:From; b=dryEU8vuKXjl84VAE+M40VGGi7nGxm8ovCVCMucUgpThKs2sUz3qcwZ3W1U3SO41Q yBlXAi//zTnKzXKf3pwbBIj655s8ZhefZ3DrOUEF67vn2+4BVYx0i6tnrY7np8uEKz lXB4TA/C3cFLRkW5xm2PKU67lEEHPoqa43lRj2yDEZpYbwBtFXsLkSpVP9UslIdTqb ntSZYaMW2Y8C27wojoA5ti4D59YSV6QWOXs8DGpLO+T0e2WDC8R/7GPkSglveqst2M Q5tbDAPSNKaU5wGwFhd4/XN2tzkbJhRknk13bi62WboQx/GdH4pL0V7FOsFuYvqsQT fF84g13eyMqPg== From: Eric Biggers To: linux-block@vger.kernel.org, linux-fscrypt@vger.kernel.org Cc: linux-arm-msm@vger.kernel.org, kernel-team@android.com, Thara Gopinath , Gaurav Kashyap , Satya Tangirala Subject: [RFC PATCH v2 0/5] Support for hardware-wrapped inline encryption keys Date: Thu, 16 Sep 2021 10:49:23 -0700 Message-Id: <20210916174928.65529-1-ebiggers@kernel.org> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fscrypt@vger.kernel.org [ NOTE: this patchset is an RFC that isn't ready for merging yet because it doesn't yet include the vendor-specific UFS or eMMC driver changes needed to actually use the feature. I.e., this patchset isn't sufficient to actually use hardware-wrapped keys with upstream yet. For context, hardware-wrapped key support has been out-of-tree in the Android kernels since early last year; upstreaming has been blocked on hardware availability and support. However, an SoC that supports this feature (SM8350, a.k.a. Qualcomm Snapdragon 888) finally has been publicly released and had basic SoC support upstreamed. Also, some other hardware will support the same feature soon. So, things should be progressing soon. So while the driver changes are gotten into an upstream-ready form, I wanted to get things started and give people a chance to give early feedback on the plan for how the kernel will support this type of hardware.] This patchset adds framework-level support (i.e., block and fscrypt support) for hardware-wrapped keys when the inline encryption hardware supports them. Hardware-wrapped keys are inline encryption keys that are wrapped (encrypted) by a key internal to the hardware. Except at initial unlocking time, the wrapping key is an ephemeral, per-boot key. Hardware-wrapped keys can only be unwrapped (decrypted) by the hardware, e.g. when a key is programmed into a keyslot. They are never visible to software in raw form, except optionally during key generation (the hardware supports importing keys as well as generating keys itself). This feature protects the encryption keys from read-only compromises of kernel memory, such as that which can occur during a cold boot attack. It does this without limiting the number of keys that can be used, as would be the case with solutions that didn't use key wrapping. The kernel changes to support this feature basically consist of changes to blk-crypto to allow a blk_crypto_key to be hardware-wrapped and to allow storage drivers to support hardware-wrapped keys, new block device ioctls for creating and preparing hardware-wrapped keys, and changes to fscrypt to allow the fscrypt master keys to be hardware-wrapped. For full details, see the individual patches, especially the detailed documentation they add to Documentation/block/inline-encryption.rst and Documentation/filesystems/fscrypt.rst. This patchset is organized as follows: - Patch 1 adds the block support and documentation, excluding the ioctls needed to get a key ready to be used in the first place. - Patch 2 adds new block device ioctls for creating and preparing hardware-wrapped keys. - Patches 3-4 clean up the fscrypt documentation and key validation logic. These aren't specific to hardware-wrapped keys per se, so these don't need to wait for the rest of the patches. - Patch 5 adds the fscrypt support and documentation. This patchset applies to v5.15-rc1 plus my other patchset "[PATCH v2 0/4] blk-crypto cleanups". It can also be retrieved from tag "wrapped-keys-v2" of https://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git. Changed v1 => v2: - Added new ioctls for creating and preparing hardware-wrapped keys. - Rebased onto my patchset which renames blk_keyslot_manager to blk_crypto_profile. Eric Biggers (5): block: add basic hardware-wrapped key support block: add ioctls to create and prepare hardware-wrapped keys fscrypt: improve documentation for inline encryption fscrypt: allow 256-bit master keys with AES-256-XTS fscrypt: add support for hardware-wrapped keys Documentation/block/inline-encryption.rst | 240 +++++++++++++++++++++- Documentation/filesystems/fscrypt.rst | 223 +++++++++++++++++--- block/blk-crypto-fallback.c | 5 +- block/blk-crypto-internal.h | 10 + block/blk-crypto-profile.c | 97 +++++++++ block/blk-crypto.c | 158 +++++++++++++- block/ioctl.c | 4 + drivers/md/dm-table.c | 1 + drivers/mmc/host/cqhci-crypto.c | 2 + drivers/scsi/ufs/ufshcd-crypto.c | 1 + fs/crypto/fscrypt_private.h | 88 +++++++- fs/crypto/hkdf.c | 15 +- fs/crypto/inline_crypt.c | 64 +++++- fs/crypto/keyring.c | 119 ++++++++--- fs/crypto/keysetup.c | 131 ++++++++++-- fs/crypto/keysetup_v1.c | 5 +- fs/crypto/policy.c | 11 +- include/linux/blk-crypto-profile.h | 80 ++++++++ include/linux/blk-crypto.h | 70 ++++++- include/uapi/linux/fs.h | 19 ++ include/uapi/linux/fscrypt.h | 7 +- 21 files changed, 1223 insertions(+), 127 deletions(-)