Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: Take ima_file_free() to proper place. ima: rename PATH_CHECK to FILE_CHECK ima: rename ima_path_check to ima_file_check ima: initialize ima before inodes can be allocated fix ima breakage Take ima_path_check() in nfsd past dentry_open() in nfsd_open() freeze_bdev: don't deactivate successfully frozen MS_RDONLY sb befs: fix leak
Showing
- Documentation/ABI/testing/ima_policy 6 additions, 6 deletionsDocumentation/ABI/testing/ima_policy
- fs/befs/linuxvfs.c 1 addition, 0 deletionsfs/befs/linuxvfs.c
- fs/block_dev.c 4 additions, 3 deletionsfs/block_dev.c
- fs/file_table.c 1 addition, 0 deletionsfs/file_table.c
- fs/namei.c 2 additions, 4 deletionsfs/namei.c
- fs/nfsd/vfs.c 1 addition, 1 deletionfs/nfsd/vfs.c
- include/linux/ima.h 2 additions, 2 deletionsinclude/linux/ima.h
- init/main.c 1 addition, 1 deletioninit/main.c
- security/integrity/ima/ima.h 1 addition, 2 deletionssecurity/integrity/ima/ima.h
- security/integrity/ima/ima_api.c 2 additions, 2 deletionssecurity/integrity/ima/ima_api.c
- security/integrity/ima/ima_iint.c 3 additions, 6 deletionssecurity/integrity/ima/ima_iint.c
- security/integrity/ima/ima_main.c 93 additions, 146 deletionssecurity/integrity/ima/ima_main.c
- security/integrity/ima/ima_policy.c 6 additions, 3 deletionssecurity/integrity/ima/ima_policy.c
- security/security.c 0 additions, 2 deletionssecurity/security.c
Loading
Please register or sign in to comment