Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt
Pull fscrypt updates from Ted Ts'o: "Refactor support for encrypted symlinks to move common code to fscrypt" Ted also points out about the merge: "This makes the f2fs symlink code use the fscrypt_encrypt_symlink() from the fscrypt tree. This will end up dropping the kzalloc() -> f2fs_kzalloc() change, which means the fscrypt-specific allocation won't get tested by f2fs's kmalloc error injection system; which is fine" * tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt: (26 commits) fscrypt: fix build with pre-4.6 gcc versions fscrypt: remove 'ci' parameter from fscrypt_put_encryption_info() fscrypt: document symlink length restriction fscrypt: fix up fscrypt_fname_encrypted_size() for internal use fscrypt: define fscrypt_fname_alloc_buffer() to be for presented names fscrypt: calculate NUL-padding length in one place only fscrypt: move fscrypt_symlink_data to fscrypt_private.h fscrypt: remove fscrypt_fname_usr_to_disk() ubifs: switch to fscrypt_get_symlink() ubifs: switch to fscrypt ->symlink() helper functions ubifs: free the encrypted symlink target f2fs: switch to fscrypt_get_symlink() f2fs: switch to fscrypt ->symlink() helper functions ext4: switch to fscrypt_get_symlink() ext4: switch to fscrypt ->symlink() helper functions fscrypt: new helper function - fscrypt_get_symlink() fscrypt: new helper functions for ->symlink() fscrypt: trim down fscrypt.h includes fscrypt: move fscrypt_is_dot_dotdot() to fs/crypto/fname.c fscrypt: move fscrypt_valid_enc_modes() to fscrypt_private.h ...
Showing
- Documentation/filesystems/fscrypt.rst 8 additions, 2 deletionsDocumentation/filesystems/fscrypt.rst
- fs/crypto/crypto.c 1 addition, 0 deletionsfs/crypto/crypto.c
- fs/crypto/fname.c 61 additions, 79 deletionsfs/crypto/fname.c
- fs/crypto/fscrypt_private.h 31 additions, 0 deletionsfs/crypto/fscrypt_private.h
- fs/crypto/hooks.c 158 additions, 0 deletionsfs/crypto/hooks.c
- fs/crypto/keyinfo.c 4 additions, 13 deletionsfs/crypto/keyinfo.c
- fs/ext4/namei.c 15 additions, 43 deletionsfs/ext4/namei.c
- fs/ext4/super.c 1 addition, 3 deletionsfs/ext4/super.c
- fs/ext4/symlink.c 6 additions, 37 deletionsfs/ext4/symlink.c
- fs/f2fs/inode.c 1 addition, 1 deletionfs/f2fs/inode.c
- fs/f2fs/namei.c 25 additions, 107 deletionsfs/f2fs/namei.c
- fs/ubifs/dir.c 15 additions, 48 deletionsfs/ubifs/dir.c
- fs/ubifs/file.c 2 additions, 34 deletionsfs/ubifs/file.c
- fs/ubifs/super.c 1 addition, 3 deletionsfs/ubifs/super.c
- include/linux/fscrypt.h 67 additions, 107 deletionsinclude/linux/fscrypt.h
- include/linux/fscrypt_notsupp.h 41 additions, 18 deletionsinclude/linux/fscrypt_notsupp.h
- include/linux/fscrypt_supp.h 63 additions, 5 deletionsinclude/linux/fscrypt_supp.h
Loading
Please register or sign in to comment