Merge tag 'for-linus-4.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs
Pull f2fs/fscrypto fixes from Jaegeuk Kim: "In addition to f2fs/fscrypto fixes, I've added one patch which prevents RCU mode lookup in d_revalidate, as Al mentioned. These patches fix f2fs and fscrypto based on -rc3 bug fixes in ext4 crypto, which have not yet been fully propagated as follows. - use of dget_parent and file_dentry to avoid crashes - disallow RCU-mode lookup in d_invalidate - disallow -ENOMEM in the core data encryption path" * tag 'for-linus-4.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: ext4/fscrypto: avoid RCU lookup in d_revalidate fscrypto: don't let data integrity writebacks fail with ENOMEM f2fs: use dget_parent and file_dentry in f2fs_file_open fscrypto: use dget_parent() in fscrypt_d_revalidate()
Showing
- fs/crypto/crypto.c 32 additions, 19 deletionsfs/crypto/crypto.c
- fs/ext4/crypto.c 4 additions, 0 deletionsfs/ext4/crypto.c
- fs/f2fs/data.c 13 additions, 3 deletionsfs/f2fs/data.c
- fs/f2fs/file.c 7 additions, 3 deletionsfs/f2fs/file.c
- include/linux/fscrypto.h 5 additions, 4 deletionsinclude/linux/fscrypto.h
Please register or sign in to comment