Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (30 commits) TOMOYO: Add recursive directory matching operator support. remove CONFIG_SECURITY_FILE_CAPABILITIES compile option SELinux: print denials for buggy kernel with unknown perms Silence the existing API for capability version compatibility check. LSM: Move security_path_chmod()/security_path_chown() to after mutex_lock(). SELinux: header generation may hit infinite loop selinux: Fix warnings security: report the module name to security_module_request Config option to set a default LSM sysctl: require CAP_SYS_RAWIO to set mmap_min_addr tpm: autoload tpm_tis based on system PnP IDs tpm_tis: TPM_STS_DATA_EXPECT workaround define convenient securebits masks for prctl users (v2) tpm: fix header for modular build tomoyo: improve hash bucket dispersion tpm add default function definitions LSM: imbed ima calls in the security hooks SELinux: add .gitignore files for dynamic classes security: remove root_plug SELinux: fix locking issue introduced with c6d3aaa4 ...
Showing
- Documentation/dontdiff 3 additions, 0 deletionsDocumentation/dontdiff
- Documentation/kernel-parameters.txt 0 additions, 10 deletionsDocumentation/kernel-parameters.txt
- drivers/char/tpm/tpm.c 1 addition, 1 deletiondrivers/char/tpm/tpm.c
- drivers/char/tpm/tpm_tis.c 10 additions, 1 deletiondrivers/char/tpm/tpm_tis.c
- fs/exec.c 0 additions, 4 deletionsfs/exec.c
- fs/file_table.c 0 additions, 2 deletionsfs/file_table.c
- fs/inode.c 0 additions, 10 deletionsfs/inode.c
- fs/namespace.c 10 additions, 10 deletionsfs/namespace.c
- fs/open.c 20 additions, 7 deletionsfs/open.c
- include/linux/Kbuild 1 addition, 0 deletionsinclude/linux/Kbuild
- include/linux/capability.h 0 additions, 2 deletionsinclude/linux/capability.h
- include/linux/init_task.h 0 additions, 4 deletionsinclude/linux/init_task.h
- include/linux/lsm_audit.h 10 additions, 8 deletionsinclude/linux/lsm_audit.h
- include/linux/securebits.h 18 additions, 6 deletionsinclude/linux/securebits.h
- include/linux/security.h 45 additions, 3 deletionsinclude/linux/security.h
- include/linux/tpm.h 8 additions, 1 deletioninclude/linux/tpm.h
- kernel/capability.c 8 additions, 7 deletionskernel/capability.c
- kernel/kmod.c 4 additions, 4 deletionskernel/kmod.c
- mm/mmap.c 0 additions, 4 deletionsmm/mmap.c
- scripts/selinux/Makefile 2 additions, 2 deletionsscripts/selinux/Makefile
Loading
Please register or sign in to comment