• Linus Torvalds's avatar
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · fb2e2c85
    Linus Torvalds authored
    Pull security layer updates from James Morris:
     "Changes for this kernel include maintenance updates for Smack, SELinux
      (and several networking fixes), IMA and TPM"
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (39 commits)
      SELinux: Fix memory leak upon loading policy
      tpm/tpm-sysfs: active_show() can be static
      tpm: tpm_tis: Fix compile problems with CONFIG_PM_SLEEP/CONFIG_PNP
      tpm: Make tpm-dev allocate a per-file structure
      tpm: Use the ops structure instead of a copy in tpm_vendor_specific
      tpm: Create a tpm_class_ops structure and use it in the drivers
      tpm: Pull all driver sysfs code into tpm-sysfs.c
      tpm: Move sysfs functions from tpm-interface to tpm-sysfs
      tpm: Pull everything related to /dev/tpmX into tpm-dev.c
      char: tpm: nuvoton: remove unused variable
      tpm: MAINTAINERS: Cleanup TPM Maintainers file
      tpm/tpm_i2c_atmel: fix coccinelle warnings
      tpm/tpm_ibmvtpm: fix unreachable code warning (smatch warning)
      tpm/tpm_i2c_stm_st33: Check return code of get_burstcount
      tpm/tpm_ppi: Check return value of acpi_get_name
      tpm/tpm_ppi: Do not compare strcmp(a,b) == -1
      ima: remove unneeded size_limit argument from ima_eventdigest_init_common()
      ima: update IMA-templates.txt documentation
      ima: pass HASH_ALGO__LAST as hash algo in ima_eventdigest_init()
      ima: change the default hash algorithm to SHA1 in ima_eventdigest_ng_init()
      ...
    fb2e2c85
tpm_ppi.c 13.3 KB