summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-06-08 00:53:17 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2018-06-08 00:53:17 +0200
commit294248e9fb46cb1342ac18fc2fb5fad0b7e3b3b1 (patch)
tree5b5262aefe415e6659718c00a0c76eb17e0b6a66 /security
parentMerge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
parentMerge tag 'tpmdd-next-20180602' of git://git.infradead.org/users/jjs/linux-tp... (diff)
downloadlinux-294248e9fb46cb1342ac18fc2fb5fad0b7e3b3b1.tar.xz
linux-294248e9fb46cb1342ac18fc2fb5fad0b7e3b3b1.zip
Merge branch 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull TPM updates from James Morris: "From Jarkko: This purely a bug fix release. The only major change is to move the event log code to its own subdirectory because there starts to be so much of it" * 'next-tpm' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: tpm: fix race condition in tpm_common_write() tpm: reduce polling time to usecs for even finer granularity tpm: replace kmalloc() + memcpy() with kmemdup() tpm: replace kmalloc() + memcpy() with kmemdup() tpm: fix use after free in tpm2_load_context() tpm: reduce poll sleep time in tpm_transmit() tpm_tis: verify locality released before returning from release_locality tpm: tpm_crb: relinquish locality on error path. tpm/st33zp24: Fix spelling mistake in macro ST33ZP24_TISREGISTER_UKNOWN tpm: Move eventlog declarations to its own header tpm: Move shared eventlog functions to common.c tpm: Move eventlog files to a subdirectory tpm: Add explicit endianness cast tpm: st33zp24: remove redundant null check on chip tpm: move the delay_msec increment after sleep in tpm_transmit()
Diffstat (limited to 'security')
0 files changed, 0 insertions, 0 deletions