• Linus Torvalds's avatar
    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · e05644e1
    Linus Torvalds authored
    Pull security subsystem updates from James Morris:
     "Nothing groundbreaking for this kernel, just cleanups and fixes, and a
      couple of Smack enhancements."
    
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (21 commits)
      Smack: Maintainer Record
      Smack: don't show empty rules when /smack/load or /smack/load2 is read
      Smack: user access check bounds
      Smack: onlycap limits on CAP_MAC_ADMIN
      Smack: fix smack_new_inode bogosities
      ima: audit is compiled only when enabled
      ima: ima_initialized is set only if successful
      ima: add policy for pseudo fs
      ima: remove unused cleanup functions
      ima: free securityfs violations file
      ima: use full pathnames in measurement list
      security: Fix nommu build.
      samples: seccomp: add .gitignore for untracked executables
      tpm: check the chip reference before using it
      TPM: fix memleak when register hardware fails
      TPM: chip disabled state erronously being reported as error
      MAINTAINERS: TPM maintainers' contacts update
      Merge branches 'next-queue' and 'next' into next
      Remove unused code from MPI library
      Revert "crypto: GnuPG based MPI lib - additional sources (part 4)"
      ...
    e05644e1
keyctl.c 39.6 KB