linux-integrity.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] selftest: tpm2: Add Client.__del__() to close /dev/tpm* handle
@ 2022-09-20 13:15 Stefan Berger
  2022-09-21 17:59 ` Jarkko Sakkinen
  0 siblings, 1 reply; 2+ messages in thread
From: Stefan Berger @ 2022-09-20 13:15 UTC (permalink / raw)
  To: jarkko, linux-integrity
  Cc: peterhuewe, linux-kernel, linux-kselftest, skhan, shuah, 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 <shuah@kernel.org>
Cc: linux-kselftest@vger.kernel.org
Cc: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>

---
 tools/testing/selftests/tpm2/tpm2.py | 4 ++++
 1 file changed, 4 insertions(+)

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()
 
-- 
2.36.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] selftest: tpm2: Add Client.__del__() to close /dev/tpm* handle
  2022-09-20 13:15 [PATCH v2] selftest: tpm2: Add Client.__del__() to close /dev/tpm* handle Stefan Berger
@ 2022-09-21 17:59 ` Jarkko Sakkinen
  0 siblings, 0 replies; 2+ messages in thread
From: Jarkko Sakkinen @ 2022-09-21 17:59 UTC (permalink / raw)
  To: Stefan Berger
  Cc: linux-integrity, peterhuewe, linux-kernel, linux-kselftest, skhan, shuah

On Tue, Sep 20, 2022 at 09:15:18AM -0400, Stefan Berger wrote:
> 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 <shuah@kernel.org>
> Cc: linux-kselftest@vger.kernel.org
> Cc: Jarkko Sakkinen <jarkko@kernel.org>
> Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
> 
> ---
>  tools/testing/selftests/tpm2/tpm2.py | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> 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()
>  
> -- 
> 2.36.1
> 


Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

BR, Jarkko

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-09-21 17:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-20 13:15 [PATCH v2] selftest: tpm2: Add Client.__del__() to close /dev/tpm* handle Stefan Berger
2022-09-21 17:59 ` Jarkko Sakkinen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).