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
..
2011-10-24 16:52:39 +02:00
evm
2011-07-18 12:29:40 -04:00
2012-09-13 14:48:44 -04:00
2010-10-21 20:21:03 -04:00
2012-03-28 18:41:23 +01:00
2011-03-31 11:26:23 -03:00
2012-05-23 09:40:09 +01:00
2012-04-23 14:23:32 +03:00
2011-03-22 04:53:09 -03:00
2008-11-12 17:17:18 -08:00
2008-05-24 09:56:07 -07:00
2011-03-31 11:26:23 -03:00
2011-04-29 18:09:34 -07:00
2009-02-18 15:37:56 -08:00
2011-02-21 20:16:21 -05:00
2009-09-23 07:39:48 -07:00
2008-04-19 19:10:28 -07:00
2012-06-25 13:48:15 +02:00
2008-07-24 10:47:17 -07:00
2008-04-18 08:56:07 -07:00
2009-06-18 13:04:04 -07:00