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
..
2014-12-14 14:57:16 -08:00
2014-12-02 16:20:59 -08:00
2014-11-24 17:24:08 -05:00
2014-12-15 18:19:03 -08:00
2015-02-11 10:56:48 -08:00
2014-11-25 20:11:12 -08:00
2015-02-11 10:28:45 -08:00
2015-01-29 10:49:28 +02:00
2014-12-14 14:57:16 -08:00
2014-12-14 16:10:09 -08:00
2014-12-18 19:08:10 -08:00
2014-12-14 16:10:09 -08:00
2014-12-19 22:55:06 +01:00
2014-12-14 16:10:09 -08:00
2015-01-21 19:21:30 +01:00
2014-11-10 09:27:30 -07:00
2015-02-11 18:03:54 -08:00
2014-11-04 17:34:15 -08:00
2014-12-31 13:06:50 -05:00
2015-02-10 16:45:56 -08:00
2015-01-27 11:09:13 +01:00
2014-12-16 14:53:01 -08:00
2015-01-15 10:34:54 +01:00
2015-01-15 10:34:54 +01:00
2015-01-24 10:11:12 +01:00
2014-12-18 09:39:51 +01:00
2015-01-04 23:11:43 -05:00
2014-12-17 08:26:51 -05:00
2015-02-11 17:06:05 -08:00
2015-02-11 17:06:02 -08:00
2014-11-04 13:18:52 -07:00
2014-11-04 13:29:38 +00:00
2014-12-11 13:06:58 -08:00
2014-12-14 14:57:16 -08:00
2015-02-11 18:15:38 -08:00
2015-01-06 11:01:13 -08:00
2015-01-22 15:10:56 +01:00
2015-01-03 14:32:57 -05:00
2014-11-06 14:57:27 -08:00
2014-11-28 16:08:16 +01:00
2014-12-09 12:05:24 +02:00
2014-12-15 23:49:28 +02:00