diff options
| author |   Eric Biggers <ebiggers@google.com> | 2020-11-10 17:52:24 -0800 |
|---|---|---|
| committer | Eric Biggers <ebiggers@google.com> | 2020-11-11 20:59:07 -0800 |
| commit | d19d8d345eecd9247cbe6cbf27aef271bd88aba7 (patch) | |
| tree | 0044d8b76c5188e3cfba501b9237453cc35e3915 /fs/crypto | |
| parent | fscrypt: remove reachable WARN in fscrypt_setup_iv_ino_lblk_32_key() (diff) | |
| download | linux-dev-d19d8d345eecd9247cbe6cbf27aef271bd88aba7.tar.xz linux-dev-d19d8d345eecd9247cbe6cbf27aef271bd88aba7.zip | |
fscrypt: fix inline encryption not used on new files
The new helper function fscrypt_prepare_new_inode() runs before
S_ENCRYPTED has been set on the new inode. This accidentally made
fscrypt_select_encryption_impl() never enable inline encryption on newly
created files, due to its use of fscrypt_needs_contents_encryption()
which only returns true when S_ENCRYPTED is set.
Fix this by using S_ISREG() directly instead of
fscrypt_needs_contents_encryption(), analogous to what
select_encryption_mode() does.
I didn't notice this earlier because by design, the user-visible
behavior is the same (other than performance, potentially) regardless of
whether inline encryption is used or not.
Fixes: a992b20cd4ee ("fscrypt: add fscrypt_prepare_new_inode() and fscrypt_set_context()")
Reviewed-by: Satya Tangirala <satyat@google.com>
Link: https://lore.kernel.org/r/20201111015224.303073-1-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Diffstat (limited to 'fs/crypto')
| -rw-r--r-- | fs/crypto/inline_crypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/crypto/inline_crypt.c b/fs/crypto/inline_crypt.c index 89bffa82ed74..c57bebfa48fe 100644 --- a/fs/crypto/inline_crypt.c +++ b/fs/crypto/inline_crypt.c @@ -74,7 +74,7 @@ int fscrypt_select_encryption_impl(struct fscrypt_info *ci) int i; /* The file must need contents encryption, not filenames encryption */ - if (!fscrypt_needs_contents_encryption(inode)) + if (!S_ISREG(inode->i_mode)) return 0; /* The crypto mode must have a blk-crypto counterpart */ |