Linus Torvalds 8cc748aa76 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security layer updates from James Morris:
 "Highlights:

   - Smack adds secmark support for Netfilter
   - /proc/keys is now mandatory if CONFIG_KEYS=y
   - TPM gets its own device class
   - Added TPM 2.0 support
   - Smack file hook rework (all Smack users should review this!)"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (64 commits)
  cipso: don't use IPCB() to locate the CIPSO IP option
  SELinux: fix error code in policydb_init()
  selinux: add security in-core xattr support for pstore and debugfs
  selinux: quiet the filesystem labeling behavior message
  selinux: Remove unused function avc_sidcmp()
  ima: /proc/keys is now mandatory
  Smack: Repair netfilter dependency
  X.509: silence asn1 compiler debug output
  X.509: shut up about included cert for silent build
  KEYS: Make /proc/keys unconditional if CONFIG_KEYS=y
  MAINTAINERS: email update
  tpm/tpm_tis: Add missing ifdef CONFIG_ACPI for pnp_acpi_device
  smack: fix possible use after frees in task_security() callers
  smack: Add missing logging in bidirectional UDS connect check
  Smack: secmark support for netfilter
  Smack: Rework file hooks
  tpm: fix format string error in tpm-chip.c
  char/tpm/tpm_crb: fix build error
  smack: Fix a bidirectional UDS connect check typo
  smack: introduce a special case for tmpfs in smack_d_instantiate()
  ...
2015-02-11 20:25:11 -08:00
..
2013-05-05 00:11:29 -04:00
2013-02-22 23:31:31 -05:00
2013-05-05 00:12:29 -04:00
2013-05-05 00:12:29 -04:00
2014-09-23 23:44:16 -07:00
2013-12-18 16:39:54 -08:00
2014-09-23 23:44:16 -07:00
2012-11-21 12:55:19 -08:00
2011-03-31 11:26:23 -03:00
2014-11-10 15:59:21 +01:00
2013-12-19 15:10:49 +01:00
2013-02-22 23:31:31 -05:00
2012-03-28 18:30:03 +01:00
2012-10-07 07:22:32 -07:00
2013-02-22 23:31:31 -05:00
2015-02-09 12:28:42 -08:00
2011-01-10 08:51:44 -08:00
2013-10-16 12:36:10 -07:00
2014-04-16 14:21:06 -07:00