Skip to contentSkip to conversation

selftest: tpm2: Add Client.__del__() to close /dev/tpm* handle

PATCH In review Stefan Berger 2 participants 2 messages Sep 20, 2022 – Sep 21, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 selftest: tpm2: Add Client.__del__() to close /dev/tpm* handle

The following output can bee seen when the test is executed:

  test_flush_context (tpm2_tests.SpaceTest) ... \
    /usr/lib64/python3.6/unittest/case.py:605: ResourceWarning: \
    unclosed file <_io.FileIO name='/dev/tpmrm0' mode='rb+' closefd=True>

An instance of Client does not implicitly close /dev/tpm* handle, once it gets destroyed. Close the file handle in the class destructor Client.__del__().

Fixes 6ea3dfe1e0732 ("selftests: add TPM 2.0 tests")
Cc Shuah Khan <[email protected]>
Cc Jarkko Sakkinen <[email protected]>
---
 tools/testing/selftests/tpm2/tpm2.py | 4 ++++
 1 file changed, 4 insertions(+)
tools/testing/selftests/tpm2/tpm2.py +4 -0
index 057a4f49c79d..c7363c6764fc 100644
@@ -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()
 
Signature · 1 line
2.36.1
maintainer Reviewed-by on v2 1/1
#1 lore raw
Quoted 38 lines · Stefan Berger

The following output can bee seen when the test is executed:

  test_flush_context (tpm2_tests.SpaceTest) ... \
    /usr/lib64/python3.6/unittest/case.py:605: ResourceWarning: \
    unclosed file <_io.FileIO name='/dev/tpmrm0' mode='rb+' closefd=True>

An instance of Client does not implicitly close /dev/tpm* handle, once it gets destroyed. Close the file handle in the class destructor Client.__del__().

Fixes 6ea3dfe1e0732 ("selftests: add TPM 2.0 tests")
Cc Shuah Khan <[email protected]>
Cc Jarkko Sakkinen <[email protected]>
---
 tools/testing/selftests/tpm2/tpm2.py | 4 ++++
 1 file changed, 4 insertions(+)
tools/testing/selftests/tpm2/tpm2.py +4 -0
index 057a4f49c79d..c7363c6764fc 100644
@@ -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()
 
Signature · 1 line
2.36.1

BR, Jarkko