linux/drivers/char/tpm
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
..
Kconfig drivers/char/tpm: Add new device driver to support IBM vTPM 2012-08-22 16:21:45 -05:00
Makefile driver: add PPI support in tpm driver 2012-08-22 16:23:42 -05:00
tpm_acpi.c tpm: fix tpm_acpi sparse warning on different address spaces 2012-09-12 13:18:31 +10:00
tpm_atmel.c tpm_atmel: Use struct dev_pm_ops for power management 2012-07-10 21:37:02 +02:00
tpm_atmel.h tpmdd maintainers 2007-08-22 19:52:44 -07:00
tpm_eventlog.c tpm: modularize event log collection 2012-08-22 11:11:25 -05:00
tpm_eventlog.h drivers/char/tpm: Add securityfs support for event log 2012-08-22 16:22:47 -05:00
tpm_i2c_infineon.c char/tpm: Add new driver for Infineon I2C TIS TPM 2012-08-22 11:11:13 -05:00
tpm_ibmvtpm.c drivers/char/tpm: Add new device driver to support IBM vTPM 2012-08-22 16:21:45 -05:00
tpm_ibmvtpm.h drivers/char/tpm: Add new device driver to support IBM vTPM 2012-08-22 16:21:45 -05:00
tpm_infineon.c MAINTAINERS: TPM maintainers' contacts update 2012-06-12 18:53:22 -03:00
tpm_nsc.c tpm_nsc: Use struct dev_pm_ops for power management 2012-07-10 21:37:18 +02:00
tpm_of.c drivers/char/tpm: Add securityfs support for event log 2012-08-22 16:22:47 -05:00
tpm_ppi.c driver/char/tpm: declare internal symbols as static 2012-09-04 16:52:23 -07:00
tpm_tis.c tpm: compile out unused code in the PNP and PM cases 2012-08-22 11:12:03 -05:00
tpm.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
tpm.h driver: add PPI support in tpm driver 2012-08-22 16:23:42 -05:00