diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-10 13:09:33 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-10 13:09:33 -0700 |
commit | ada3bfb6492a6d0d3eca50f3b61315fe032efc72 (patch) | |
tree | 10be4da5fc33357dc362e64e295c00ac7be421b4 /tools | |
parent | 3604a7f568d3f67be8c13736201411ee83b210a1 (diff) | |
parent | 2d869f0b458547386fbcd8cf3004b271b7347b7f (diff) |
Merge tag 'tpmdd-next-v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd
Pull tpm updates from Jarkko Sakkinen:
"Just a few bug fixes this time"
* tag 'tpmdd-next-v6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
selftest: tpm2: Add Client.__del__() to close /dev/tpm* handle
security/keys: Remove inconsistent __user annotation
char: move from strlcpy with unused retval to strscpy
Diffstat (limited to 'tools')
-rw-r--r-- | tools/testing/selftests/tpm2/tpm2.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/testing/selftests/tpm2/tpm2.py b/tools/testing/selftests/tpm2/tpm2.py index 057a4f49c79d..c7363c6764fc 100644 --- a/tools/testing/selftests/tpm2/tpm2.py +++ b/tools/testing/selftests/tpm2/tpm2.py @@ -371,6 +371,10 @@ class Client: fcntl.fcntl(self.tpm, fcntl.F_SETFL, flags) self.tpm_poll = select.poll() + def __del__(self): + if self.tpm: + self.tpm.close() + def close(self): self.tpm.close() |