mbox series

[GIT,PULL] fscrypt updates for 5.2

Message ID 20190507233042.GA28476@mit.edu
State Accepted
Headers show
Series [GIT,PULL] fscrypt updates for 5.2 | expand

Pull-request

git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git tags/fscrypt_for_linus

Message

Theodore Y. Ts'o May 7, 2019, 11:30 p.m. UTC
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.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(-)

Comments

Eric Biggers May 8, 2019, 1:19 a.m. UTC | #1
On Tue, May 07, 2019 at 07:30:42PM -0400, Theodore Ts'o wrote:
> 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.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
> 

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
pr-tracker-bot@kernel.org May 8, 2019, 4:55 a.m. UTC | #2
The pull request you sent on Tue, 7 May 2019 19:30:42 -0400:

> git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git tags/fscrypt_for_linus

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/a9fbcd6728837268784439ad0b02ede2c024c516

Thank you!