Merge branch 'fixes-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull TPM fixes from James Morris: "From Jarkko: These are critical fixes for v5.1. Contains also couple of new selftests for v5.1 features (partial reads in /dev/tpm0)" * 'fixes-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: selftests/tpm2: Open tpm dev in unbuffered mode selftests/tpm2: Extend tests to cover partial reads KEYS: trusted: fix -Wvarags warning tpm: Fix the type of the return value in calc_tpm2_event_size() KEYS: trusted: allow trusted.ko to initialize w/o a TPM tpm: fix an invalid condition in tpm_common_poll tpm: turn on TPM on suspend for TPM 1.x
Showing
- drivers/char/tpm/eventlog/tpm2.c 2 additions, 2 deletionsdrivers/char/tpm/eventlog/tpm2.c
- drivers/char/tpm/tpm-dev-common.c 8 additions, 1 deletiondrivers/char/tpm/tpm-dev-common.c
- drivers/char/tpm/tpm-interface.c 6 additions, 8 deletionsdrivers/char/tpm/tpm-interface.c
- include/keys/trusted.h 1 addition, 1 deletioninclude/keys/trusted.h
- security/keys/trusted.c 25 additions, 7 deletionssecurity/keys/trusted.c
- tools/testing/selftests/tpm2/tpm2.py 3 additions, 2 deletionstools/testing/selftests/tpm2/tpm2.py
- tools/testing/selftests/tpm2/tpm2_tests.py 63 additions, 0 deletionstools/testing/selftests/tpm2/tpm2_tests.py
Loading
Please register or sign in to comment