diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-12 16:39:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-11-12 16:39:58 -0800 |
| commit | 585e5b17b92dead8a3aca4e3c9876fbca5f7e0ba (patch) | |
| tree | bbeeca2af139c0a22fc5e0f0d437c6422ce5a89c | |
| parent | Merge tag 'gfs2-v5.10-rc3-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 (diff) | |
| parent | fscrypt: fix inline encryption not used on new files (diff) | |
| download | linux-dev-585e5b17b92dead8a3aca4e3c9876fbca5f7e0ba.tar.xz linux-dev-585e5b17b92dead8a3aca4e3c9876fbca5f7e0ba.zip | |
Merge tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
Pull fscrypt fix from Eric Biggers:
"Fix a regression where new files weren't using inline encryption when
they should be"
* tag 'fscrypt-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
fscrypt: fix inline encryption not used on new files
| -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 */ |