fscrypt updates for 5.2
Theodore Ts'o
maintainerThe following changes since commit dc4060a5dc2557e6b5aa813bf5b73677299d62d2:
Linux 5.1-rc5 (2019-04-14 15:17:41 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git tags/fscrypt_for_linus
for you to fetch changes up to 2c58d548f5706d085c4b009f6abb945220460632:
fscrypt: cache decrypted symlink target in ->i_link (2019-04-17 12:43:29 -0400)
----------------------------------------------------------------
Clean up fscrypt's dcache revalidation support, and other miscellaneous cleanups.
----------------------------------------------------------------
Eric Biggers (10):
fscrypt: drop inode argument from fscrypt_get_ctx()
fscrypt: remove WARN_ON_ONCE() when decryption fails
fscrypt: use READ_ONCE() to access ->i_crypt_info
fscrypt: clean up and improve dentry revalidation
fscrypt: fix race allowing rename() and link() of ciphertext dentries fs, fscrypt: clear DCACHE_ENCRYPTED_NAME when unaliasing directory
fscrypt: only set dentry_operations on ciphertext dentries
fscrypt: fix race where ->lookup() marks plaintext dentry as ciphertext
vfs: use READ_ONCE() to access ->i_link
fscrypt: cache decrypted symlink target in ->i_link
fs/crypto/bio.c | 8 +++----- fs/crypto/crypto.c | 74 ++++++++++++++++++++++++++++++++++------------------------------------- fs/crypto/fname.c | 5 +++-- fs/crypto/hooks.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++---------------- fs/crypto/keyinfo.c | 25 ++++++++++++++++++++++-- fs/crypto/policy.c | 6 +++--- fs/dcache.c | 2 ++ fs/ext4/ext4.h | 62 ++++++++++++++++++++++++++++++++++++++++++++--------------- fs/ext4/namei.c | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++----------------------- fs/ext4/readpage.c | 2 +- fs/ext4/super.c | 3 +++ fs/f2fs/namei.c | 17 ++++++++++------- fs/f2fs/super.c | 3 +++ fs/namei.c | 4 ++-- fs/ubifs/dir.c | 8 +++----- fs/ubifs/super.c | 3 +++ include/linux/dcache.h | 2 +- include/linux/fscrypt.h | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++--------------------- 18 files changed, 298 insertions(+), 144 deletions(-)
Eric Biggers
maintainerQuoted 16 lines · Theodore Ts'o
The following changes since commit
dc4060a5dc2557e6b5aa813bf5b73677299d62d2:Linux 5.1-rc5 (2019-04-14 15:17:41 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.gittags/fscrypt_for_linusfor you to fetch changes up to
2c58d548f5706d085c4b009f6abb945220460632:fscrypt: cache decrypted symlink target in ->i_link (2019-04-17 12:43:29 -0400)
----------------------------------------------------------------
Clean up fscrypt's dcache revalidation support, and other miscellaneous cleanups.
Quoted 13 lines
----------------------------------------------------------------
Eric Biggers (10):
fscrypt: drop inode argument fromfscrypt_get_ctx()
fscrypt: removeWARN_ON_ONCE()when decryption fails
fscrypt: useREAD_ONCE()to access ->i_crypt_info
fscrypt: clean up and improve dentry revalidation
fscrypt: fix race allowingrename()andlink()of ciphertext dentries fs, fscrypt: clearDCACHE_ENCRYPTED_NAMEwhen unaliasing directory
fscrypt: only setdentry_operationson ciphertext dentries
fscrypt: fix race where ->lookup() marks plaintext dentry as ciphertext
vfs: useREAD_ONCE()to access ->i_link
fscrypt: cache decrypted symlink target in ->i_link
There will be a merge conflict between "fscrypt: cache decrypted symlink target in ->i_link", and "ext4: make use of ->free_inode()" and "f2fs: switch to ->free_inode()". The correct resolutions should be fairly straightforward:
static void ext4_free_in_core_inode(struct inode *inode)
{
fscrypt_free_inode(inode);
kmem_cache_free(ext4_inode_cachep, EXT4_I(inode));
}and
static void f2fs_free_inode(struct inode *inode)
{
fscrypt_free_inode(inode);
kmem_cache_free(f2fs_inode_cachep, F2FS_I(inode));
}- Eric
The pull request you sent on Tue, 7 May 2019 19:30:42 -0400:
The pull request you sent on Tue, 7 May 2019 19:30:42 -0400:
Quoted 1 line
git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.gittags/fscrypt_for_linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/a9fbcd6728837268784439ad0b02ede2c024c516
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker