From: Daniel Rosenberg via Linux-f2fs-devel <linux-f2fs-devel@lists.sourceforge.net>
To: "Theodore Ts'o" <tytso@mit.edu>,
linux-ext4@vger.kernel.org, Jaegeuk Kim <jaegeuk@kernel.org>,
Chao Yu <chao@kernel.org>,
linux-f2fs-devel@lists.sourceforge.net,
Eric Biggers <ebiggers@kernel.org>,
linux-fscrypt@vger.kernel.org,
Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Daniel Rosenberg <drosen@google.com>,
linux-doc@vger.kernel.org, kernel-team@android.com,
Jonathan Corbet <corbet@lwn.net>,
linux-kernel@vger.kernel.org,
Andreas Dilger <adilger.kernel@dilger.ca>,
linux-fsdevel@vger.kernel.org,
Gabriel Krisman Bertazi <krisman@collabora.com>
Subject: [f2fs-dev] [PATCH v3 4/9] fscrypt: Only create hash key when needed
Date: Fri, 17 Jan 2020 13:42:41 -0800 [thread overview]
Message-ID: <20200117214246.235591-5-drosen@google.com> (raw)
In-Reply-To: <20200117214246.235591-1-drosen@google.com>
If a directory isn't casefolded, it doesn't need the hash key. Skip
deriving it unless we enable it later.
Signed-off-by: Daniel Rosenberg <drosen@google.com>
---
fs/crypto/keysetup.c | 2 +-
fs/crypto/policy.c | 25 +++++++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
diff --git a/fs/crypto/keysetup.c b/fs/crypto/keysetup.c
index 7445ab76e0b32..c0db9e8d31f15 100644
--- a/fs/crypto/keysetup.c
+++ b/fs/crypto/keysetup.c
@@ -217,7 +217,7 @@ static int fscrypt_setup_v2_file_key(struct fscrypt_info *ci,
if (err)
return err;
- if (S_ISDIR(ci->ci_inode->i_mode)) {
+ if (S_ISDIR(ci->ci_inode->i_mode) && IS_CASEFOLDED(ci->ci_inode)) {
err = fscrypt_hkdf_expand(&mk->mk_secret.hkdf,
HKDF_CONTEXT_FNAME_HASH_KEY,
ci->ci_nonce,
diff --git a/fs/crypto/policy.c b/fs/crypto/policy.c
index 2cd9a940d8f46..632ca355e1184 100644
--- a/fs/crypto/policy.c
+++ b/fs/crypto/policy.c
@@ -10,6 +10,7 @@
* Modified by Eric Biggers, 2019 for v2 policy support.
*/
+#include <linux/key-type.h>
#include <linux/random.h>
#include <linux/string.h>
#include <linux/mount.h>
@@ -591,6 +592,8 @@ int fscrypt_ioc_setflags_prepare(struct inode *inode,
unsigned int flags)
{
union fscrypt_policy policy;
+ struct fscrypt_info *ci;
+ struct fscrypt_master_key *mk;
int err;
/*
@@ -603,6 +606,28 @@ int fscrypt_ioc_setflags_prepare(struct inode *inode,
return err;
if (policy.version != FSCRYPT_POLICY_V2)
return -EINVAL;
+ err = fscrypt_require_key(inode);
+ if (err)
+ return err;
+ ci = inode->i_crypt_info;
+ if (ci->ci_hash_key_initialized)
+ return 0;
+ mk = ci->ci_master_key->payload.data[0];
+ down_read(&mk->mk_secret_sem);
+ if (!is_master_key_secret_present(&mk->mk_secret)) {
+ err = -ENOKEY;
+ } else {
+ err = fscrypt_hkdf_expand(&mk->mk_secret.hkdf,
+ HKDF_CONTEXT_FNAME_HASH_KEY,
+ ci->ci_nonce,
+ FS_KEY_DERIVATION_NONCE_SIZE,
+ (u8 *)&ci->ci_hash_key,
+ sizeof(ci->ci_hash_key));
+ }
+ up_read(&mk->mk_secret_sem);
+ if (err)
+ return err;
+ ci->ci_hash_key_initialized = true;
}
return 0;
--
2.25.0.341.g760bfbb309-goog
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2020-01-17 22:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-17 21:42 [f2fs-dev] [PATCH v3 0/9] Support for Casefolding and Encryption Daniel Rosenberg via Linux-f2fs-devel
2020-01-17 21:42 ` [f2fs-dev] [PATCH v3 1/9] fscrypt: Add siphash and hash key for policy v2 Daniel Rosenberg via Linux-f2fs-devel
2020-01-17 21:42 ` [f2fs-dev] [PATCH v3 2/9] fscrypt: Don't allow v1 policies with casefolding Daniel Rosenberg via Linux-f2fs-devel
2020-01-17 21:42 ` [f2fs-dev] [PATCH v3 3/9] fscrypt: Change format of no-key token Daniel Rosenberg via Linux-f2fs-devel
2020-01-17 21:42 ` Daniel Rosenberg via Linux-f2fs-devel [this message]
2020-01-17 21:42 ` [f2fs-dev] [PATCH v3 5/9] vfs: Fold casefolding into vfs Daniel Rosenberg via Linux-f2fs-devel
2020-01-20 1:35 ` Al Viro
2020-01-24 4:30 ` Daniel Rosenberg via Linux-f2fs-devel
2020-01-17 21:42 ` [f2fs-dev] [PATCH v3 6/9] f2fs: Handle casefolding with Encryption Daniel Rosenberg via Linux-f2fs-devel
2020-01-17 21:42 ` [f2fs-dev] [PATCH v3 7/9] ext4: Use struct super_blocks' casefold data Daniel Rosenberg via Linux-f2fs-devel
2020-01-17 21:42 ` [f2fs-dev] [PATCH v3 8/9] ext4: Hande casefolding with encryption Daniel Rosenberg via Linux-f2fs-devel
2020-01-17 21:42 ` [f2fs-dev] [PATCH v3 9/9] ext4: Optimize match for casefolded encrypted dirs Daniel Rosenberg via Linux-f2fs-devel
2020-01-20 4:52 ` [f2fs-dev] [PATCH v3 0/9] Support for Casefolding and Encryption Eric Biggers
2020-01-20 22:10 ` Eric Biggers
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=20200117214246.235591-5-drosen@google.com \
--to=linux-f2fs-devel@lists.sourceforge.net \
--cc=adilger.kernel@dilger.ca \
--cc=chao@kernel.org \
--cc=corbet@lwn.net \
--cc=drosen@google.com \
--cc=ebiggers@kernel.org \
--cc=jaegeuk@kernel.org \
--cc=kernel-team@android.com \
--cc=krisman@collabora.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=linux-fscrypt@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=viro@zeniv.linux.org.uk \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).