• Linus Torvalds's avatar
    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 8cc748aa
    Linus Torvalds authored
    Pull security layer updates from James Morris:
       - 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()
Makefile 7.3 KB