xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fscrypt: remove unnecessary calls to fscrypt_require_key()

Browse Source 
In an encrypted directory, a regular dentry (one that doesn't have the
no-key name flag) can only be created if the directory's encryption key
is available.

Therefore the calls to fscrypt_require_key() in __fscrypt_prepare_link()
and __fscrypt_prepare_rename() are unnecessary, as these functions
already check that the dentries they're given aren't no-key names.

Remove these unnecessary calls to fscrypt_require_key().

Link: https://lore.kernel.org/r/20201118075609.120337-6-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
This commit is contained in:
Eric Biggers
2020-11-17 23:56:09 -08:00
committed by Jaegeuk Kim
parent cfdfa25f08
commit 26461e30a7
2 changed files with 9 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
fs/crypto/hooks.c
View File

@@ -54,15 +54,12 @@ EXPORT_SYMBOL_GPL(fscrypt_file_open);
int __fscrypt_prepare_link(struct inode *inode, struct inode *dir, int __fscrypt_prepare_link(struct inode *inode, struct inode *dir,
struct dentry *dentry) struct dentry *dentry)
{ {
int err;
err = fscrypt_require_key(dir);
if (err)
return err;
/* ... in case we looked up no-key name before key was added */
if (fscrypt_is_nokey_name(dentry)) if (fscrypt_is_nokey_name(dentry))
return -ENOKEY; return -ENOKEY;
/*
* We don't need to separately check that the directory inode's key is
* available, as it's implied by the dentry not being a no-key name.
*/
if (!fscrypt_has_permitted_context(dir, inode)) if (!fscrypt_has_permitted_context(dir, inode))
return -EXDEV; return -EXDEV;
@@ -75,20 +72,13 @@ int __fscrypt_prepare_rename(struct inode *old_dir, struct dentry *old_dentry,
struct inode *new_dir, struct dentry *new_dentry, struct inode *new_dir, struct dentry *new_dentry,
unsigned int flags) unsigned int flags)
{ {
int err;
err = fscrypt_require_key(old_dir);
if (err)
return err;
err = fscrypt_require_key(new_dir);
if (err)
return err;
/* ... in case we looked up no-key name(s) before key was added */
if (fscrypt_is_nokey_name(old_dentry) || if (fscrypt_is_nokey_name(old_dentry) ||
fscrypt_is_nokey_name(new_dentry)) fscrypt_is_nokey_name(new_dentry))
return -ENOKEY; return -ENOKEY;
/*
* We don't need to separately check that the directory inodes' keys are
* available, as it's implied by the dentries not being no-key names.
*/
if (old_dir != new_dir) { if (old_dir != new_dir) {
if (IS_ENCRYPTED(new_dir) && if (IS_ENCRYPTED(new_dir) &&

3
include/linux/fscrypt.h
View File

@@ -710,8 +710,7 @@ static inline int fscrypt_require_key(struct inode *inode)
* *
* A new link can only be added to an encrypted directory if the directory's * A new link can only be added to an encrypted directory if the directory's
* encryption key is available --- since otherwise we'd have no way to encrypt * encryption key is available --- since otherwise we'd have no way to encrypt
* the filename. Therefore, we first set up the directory's encryption key (if * the filename.
* not already done) and return an error if it's unavailable.
* *
* We also verify that the link will not violate the constraint that all files * We also verify that the link will not violate the constraint that all files
* in an encrypted directory tree use the same encryption policy. * in an encrypted directory tree use the same encryption policy.