Linus Torvalds 88265322c1 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security ... Pull security subsystem updates from James Morris: "Highlights: - Integrity: add local fs integrity verification to detect offline attacks - Integrity: add digital signature verification - Simple stacking of Yama with other LSMs (per LSS discussions) - IBM vTPM support on ppc64 - Add new driver for Infineon I2C TIS TPM - Smack: add rule revocation for subject labels" Fixed conflicts with the user namespace support in kernel/auditsc.c and security/integrity/ima/ima_policy.c. * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (39 commits) Documentation: Update git repository URL for Smack userland tools ima: change flags container data type Smack: setprocattr memory leak fix Smack: implement revoking all rules for a subject label Smack: remove task_wait() hook. ima: audit log hashes ima: generic IMA action flag handling ima: rename ima_must_appraise_or_measure audit: export audit_log_task_info tpm: fix tpm_acpi sparse warning on different address spaces samples/seccomp: fix 31 bit build on s390 ima: digital signature verification support ima: add support for different security.ima data types ima: add ima_inode_setxattr/removexattr function and calls ima: add inode_post_setattr call ima: replace iint spinblock with rwlock/read_lock ima: allocating iint improvements ima: add appraise action keywords and default rules ima: integrity appraisal extension vfs: move ima_file_free before releasing the file ...		2012-10-02 21:38:48 -07:00
..
ima_api.c	ima: audit log hashes	2012-09-13 14:48:44 -04:00
ima_appraise.c	ima: generic IMA action flag handling	2012-09-13 14:23:57 -04:00
ima_audit.c	userns: Add user namespace support to IMA	2012-09-21 03:13:24 -07:00
ima_crypto.c	ima: integrity appraisal extension	2012-09-07 14:57:44 -04:00
ima_fs.c	ima: remove unused cleanup functions	2012-07-02 16:43:30 -04:00
ima_init.c	ima: remove unused cleanup functions	2012-07-02 16:43:30 -04:00
ima_main.c	ima: audit log hashes	2012-09-13 14:48:44 -04:00
ima_policy.c	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2012-10-02 21:38:48 -07:00
ima_queue.c	ima: fix invalid memory reference	2011-12-19 22:07:54 -05:00
ima.h	ima: audit log hashes	2012-09-13 14:48:44 -04:00
Kconfig	ima: integrity appraisal extension	2012-09-07 14:57:44 -04:00
Makefile	ima: integrity appraisal extension	2012-09-07 14:57:44 -04:00