Skip to content

Commit d19d8d3

Browse files
committed
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: a992b20 ("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>
1 parent 92cfcd0 commit d19d8d3

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

fs/crypto/inline_crypt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ int fscrypt_select_encryption_impl(struct fscrypt_info *ci)
7474
int i;
7575

7676
/* The file must need contents encryption, not filenames encryption */
77-
if (!fscrypt_needs_contents_encryption(inode))
77+
if (!S_ISREG(inode->i_mode))
7878
return 0;
7979

8080
/* The crypto mode must have a blk-crypto counterpart */

0 commit comments

Comments
 (0)