Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Merge commit. Changes below are compared with the first parent: 2d663b55.
Changes
53 files changed · +1281 −374
Only the first 600 diff lines are shown. Download the complete patch.
Documentation/security/keys-trusted-encrypted.txt
View filecrypto/asymmetric_keys/x509_public_key.c
View filecrypto/hash_info.c
View filedrivers/char/tpm/tpm-interface.c
View filedrivers/char/tpm/tpm.h
View filedrivers/char/tpm/tpm2-cmd.c
View filedrivers/char/tpm/tpm_crb.c
View filedrivers/char/tpm/tpm_ibmvtpm.c
View filedrivers/char/tpm/tpm_ibmvtpm.h
View filedrivers/char/tpm/tpm_tis.c
View fileThis diff is incomplete. Download the complete patch.
fs/gfs2/glops.c
View fileThis diff is incomplete. Download the complete patch.
include/crypto/hash_info.h
View fileThis diff is incomplete. Download the complete patch.
include/keys/system_keyring.h
View fileThis diff is incomplete. Download the complete patch.
include/keys/trusted-type.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/audit.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/capability.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/evm.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/key.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/lsm_hooks.h
View fileThis diff is incomplete. Download the complete patch.
include/linux/security.h
View fileThis diff is incomplete. Download the complete patch.
include/uapi/linux/hash_info.h
View fileThis diff is incomplete. Download the complete patch.
kernel/audit.c
View fileThis diff is incomplete. Download the complete patch.
kernel/audit.h
View fileThis diff is incomplete. Download the complete patch.
kernel/auditsc.c
View fileThis diff is incomplete. Download the complete patch.
security/integrity/Kconfig
View fileThis diff is incomplete. Download the complete patch.
security/integrity/digsig.c
View fileThis diff is incomplete. Download the complete patch.
security/integrity/digsig_asymmetric.c
View fileThis diff is incomplete. Download the complete patch.
security/integrity/evm/Kconfig
View fileThis diff is incomplete. Download the complete patch.
security/integrity/evm/evm.h
View fileThis diff is incomplete. Download the complete patch.
security/integrity/evm/evm_crypto.c
View fileThis diff is incomplete. Download the complete patch.
security/integrity/evm/evm_main.c
View fileThis diff is incomplete. Download the complete patch.
security/integrity/evm/evm_secfs.c
View fileThis diff is incomplete. Download the complete patch.
security/integrity/iint.c
View fileThis diff is incomplete. Download the complete patch.
security/integrity/ima/Kconfig
View fileThis diff is incomplete. Download the complete patch.
security/integrity/ima/Makefile
View fileThis diff is incomplete. Download the complete patch.
security/integrity/ima/ima.h
View fileThis diff is incomplete. Download the complete patch.
security/integrity/ima/ima_fs.c
View fileThis diff is incomplete. Download the complete patch.
security/integrity/ima/ima_init.c
View fileThis diff is incomplete. Download the complete patch.
security/integrity/ima/ima_mok.c
View fileThis diff is incomplete. Download the complete patch.
security/integrity/ima/ima_policy.c
View fileThis diff is incomplete. Download the complete patch.
security/integrity/integrity.h
View fileThis diff is incomplete. Download the complete patch.
security/keys/Kconfig
View fileThis diff is incomplete. Download the complete patch.
security/keys/key.c
View fileThis diff is incomplete. Download the complete patch.
security/keys/keyctl.c
View fileThis diff is incomplete. Download the complete patch.
security/keys/trusted.c
View fileThis diff is incomplete. Download the complete patch.
security/security.c
View fileThis diff is incomplete. Download the complete patch.
security/selinux/hooks.c
View fileThis diff is incomplete. Download the complete patch.
security/selinux/include/classmap.h
View fileThis diff is incomplete. Download the complete patch.
security/selinux/include/objsec.h
View fileThis diff is incomplete. Download the complete patch.
security/selinux/include/security.h
View fileThis diff is incomplete. Download the complete patch.
security/selinux/selinuxfs.c
View fileThis diff is incomplete. Download the complete patch.
security/selinux/ss/services.c
View fileThis diff is incomplete. Download the complete patch.
security/smack/smack_lsm.c
View fileThis diff is incomplete. Download the complete patch.