• Linus Torvalds's avatar
    Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · d488d3a4
    Linus Torvalds authored
    Pull security subsystem updates from James Morris:
     "Highlights for this window:
    
       - improved AVC hashing for SELinux by John Brooks and Stephen Smalley
    
       - addition of an unconfined label to Smack
    
       - Smack documentation update
    
       - TPM driver updates"
    
    * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (28 commits)
      lsm: copy comm before calling audit_log to avoid race in string printing
      tomoyo: Do not generate empty policy files
      tomoyo: Use if_changed when generating builtin-policy.h
      tomoyo: Use bin2c to generate builtin-policy.h
      selinux: increase avtab max buckets
      selinux: Use a better hash function for avtab
      selinux: convert avtab hash table to flex_array
      selinux: reconcile security_netlbl_secattr_to_sid() and mls_import_netlbl_cat()
      selinux: remove unnecessary pointer reassignment
      Smack: Updates for Smack documentation
      tpm/st33zp24/spi: Add missing device table for spi phy.
      tpm/st33zp24: Add proper wait for ordinal duration in case of irq mode
      smack: Fix gcc warning from unused smack_syslog_lock mutex in smackfs.c
      Smack: Allow an unconfined label in bringup mode
      Smack: getting the Smack security context of keys
      Smack: Assign smack_known_web as default smk_in label for kernel thread's socket
      tpm/tpm_infineon: Use struct dev_pm_ops for power management
      MAINTAINERS: Add Jason as designated reviewer for TPM
      tpm: Update KConfig text to include TPM2.0 FIFO chips
      tpm/st33zp24/dts/st33zp24-spi: Add dts documentation for st33zp24 spi phy
      ...
    d488d3a4
smack_lsm.c 107 KB