summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-13 02:48:10 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-13 02:48:10 +0300
commita4d8c7c9f7754405c52c59e1b1e984df5749d7bb (patch)
treefd2e53ae06ffaaaa96cda893ec01da725878a94a /include
parenta18e2fa5e670a1b84e66522b221c42875b02028a (diff)
parentcc25b994acfbc901429da682d0f73c190e960206 (diff)
downloadlinux-a4d8c7c9f7754405c52c59e1b1e984df5749d7bb.tar.xz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull security subsystem fixes from James Morris: "This includes several fixes for TPM, as well as a fix for the x.509 certificate parser to address CVE-2015-5327" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: X.509: Fix the time validation [ver #2] tpm: fix compat 'ppi' link handling in tpm_chip_register() tpm: fix missing migratable flag in sealing functionality for TPM2 TPM: revert the list handling logic fixed in 398a1e7 TPM: Avoid reference to potentially freed memory tpm_tis: restore IRQ vector in IO memory after failed probing tpm_tis: free irq after probing
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions