From patchwork Mon Oct 30 04:04:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 159471 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp1973942vqb; Sun, 29 Oct 2023 21:05:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGmmRmnTDUvR/WHhM2wpGz/WlmZTGdSad2wkH6fpWHfPhqj7jne9UOklrbgVas9G4v8A1T1 X-Received: by 2002:a05:6830:3149:b0:6c4:be02:635f with SMTP id c9-20020a056830314900b006c4be02635fmr10726582ots.5.1698638710283; Sun, 29 Oct 2023 21:05:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698638710; cv=none; d=google.com; s=arc-20160816; b=MyNZa185iz38347vpLYdlCfzHzVcxhYz+U7SXYsglIDH+Zs/Cc5PN8h9JlyhxXsvjC pk03YZgQDVaZ8l90/xR5McpAmtNotKxMqYNNZ7GsOtVhsD0qonnH19JrTHqSR8Ct6azq NBb3dSb9M+JgLn0zE8JcAZrgURGbB1nIR0HSuavcXirtVODLWqgt7LEhTLqnCzADiyIJ sxuovSjSwcRv3a15uQnXnI4VZF3B+DblkYwdUfv8U8HDM/3tO7pi/OV82mJQLtNxRbQz 0HAZpB8utjqyaFCROMV95JK5XbPlwsr8K7WpvyL7bjmIGaG4nVVph6bZne4j9CxK1Zlc uGIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=M0/er4qz3Vn17zN+A6+aVAlrWBsIixD3smsud6voVdk=; fh=pjzft55VmIwNaIjzPmooPIJWRhxifkaQ5s1KkZY7Dqc=; b=MB6jDt0rG5m6KsFqp1KCeqM9CfBmI7ivbRXBAiaT7pUQsyqAwhCAgdOsVa78kSFfld oel18lDO/2wFKFNyljbt4N4h2lEJkA90NaNpWsQiklpozOZpEYjsHCxgNq8E80q5xr1d MOs2WgXEVn+x1qadp44/q6x6QoYahuVtSqpf2bfEbeQW4T9E2JhYEaxJ+5wTpj1Y43KB 5qFgmjMZiPcYT1Gc0NFOVgzP2yopo0WJKQjN2RkeYQslU4Y9ONUQ4SlhIALYnEmxTO4W A3LH9OQrNNd0TONH/OA87nbppf1DpK81xz74htymk4nP0RzA2HxFF7xJGc31dkex7Kv1 xUnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RtH8udXQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id j8-20020a63e748000000b0058afac51c12si4591141pgk.545.2023.10.29.21.05.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 29 Oct 2023 21:05:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=RtH8udXQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id BC862809582D; Sun, 29 Oct 2023 21:05:07 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229514AbjJ3EE1 (ORCPT + 31 others); Mon, 30 Oct 2023 00:04:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231527AbjJ3EEY (ORCPT ); Mon, 30 Oct 2023 00:04:24 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B9EDAB; Sun, 29 Oct 2023 21:04:22 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3F4AAC433C8; Mon, 30 Oct 2023 04:04:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698638661; bh=UkCm3OTWARRE3MTGj4hMs3g9sGwjnFjvdJrOft2PCWM=; h=Date:From:To:Cc:Subject:From; b=RtH8udXQmHNy7sD8UiM8laIiFptr75k6TMDW5G9xwNZO/XRRhqsNvv29IlUG12jJ7 FWDTxb/On3c0tvaBgpRQUqbSlrbpIRsOO06xVIbl7m0VWoUAs3QUp3kKDQp3rzEpuI a3DCf/YWO6mh+iSMitfF8NrvLF+49M6X8ytT7Socn2iewAC6lGOKoT1QZOOqgEsnl6 TUzvzXejaKIN7/j0DOQ0lmZNJvxJrDTs1E0BWzC3iY4Gu8YOrhiHcasSDoDZN5CKAh IQdbK+cLayLqnQDGxYZgFAl9HboHL5tWPC1agPrMnBrG2AIRZA5UQNniYmLR7nvAAv rELkLw3Fzf4Sg== Date: Sun, 29 Oct 2023 21:04:19 -0700 From: Eric Biggers To: Linus Torvalds Cc: linux-fscrypt@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-btrfs@vger.kernel.org, linux-kernel@vger.kernel.org, Theodore Ts'o , Jaegeuk Kim Subject: [GIT PULL] fscrypt updates for 6.7 Message-ID: <20231030040419.GA43439@sol.localdomain> MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-1.7 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sun, 29 Oct 2023 21:05:07 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781151783862828343 X-GMAIL-MSGID: 1781151783862828343 The following changes since commit 6465e260f48790807eef06b583b38ca9789b6072: Linux 6.6-rc3 (2023-09-24 14:31:13 -0700) are available in the Git repository at: https://git.kernel.org/pub/scm/fs/fscrypt/linux.git tags/fscrypt-for-linus for you to fetch changes up to 15baf55481de700f8c4494cddb80ec4f4575548b: fscrypt: track master key presence separately from secret (2023-10-16 21:23:45 -0700) ---------------------------------------------------------------- This update adds support for configuring the crypto data unit size (i.e. the granularity of file contents encryption) to be less than the filesystem block size. This can allow users to use inline encryption hardware in some cases when it wouldn't otherwise be possible. In addition, there are two commits that are prerequisites for the extent-based encryption support that the btrfs folks are working on. ---------------------------------------------------------------- Eric Biggers (6): fscrypt: make it clearer that key_prefix is deprecated fscrypt: make the bounce page pool opt-in instead of opt-out fscrypt: compute max_lblk_bits from s_maxbytes and block size fscrypt: replace get_ino_and_lblk_bits with just has_32bit_inodes fscrypt: support crypto data unit size less than filesystem block size fscrypt: track master key presence separately from secret Josef Bacik (1): fscrypt: rename fscrypt_info => fscrypt_inode_info Documentation/filesystems/fscrypt.rst | 121 ++++++++++++++++++------- fs/ceph/crypto.c | 1 + fs/crypto/bio.c | 39 ++++---- fs/crypto/crypto.c | 163 ++++++++++++++++++--------------- fs/crypto/fname.c | 6 +- fs/crypto/fscrypt_private.h | 164 ++++++++++++++++++++++------------ fs/crypto/hooks.c | 4 +- fs/crypto/inline_crypt.c | 32 +++---- fs/crypto/keyring.c | 82 ++++++++++------- fs/crypto/keysetup.c | 62 +++++++------ fs/crypto/keysetup_v1.c | 20 +++-- fs/crypto/policy.c | 83 +++++++++++------ fs/ext4/crypto.c | 13 +-- fs/f2fs/super.c | 13 +-- fs/ubifs/crypto.c | 3 +- include/linux/fs.h | 4 +- include/linux/fscrypt.h | 82 ++++++++++------- include/uapi/linux/fscrypt.h | 3 +- 18 files changed, 546 insertions(+), 349 deletions(-)