Merge pull request #344 from ionut-arm/dangling-pointer

Fix dangling pointer issue

Author: ionut-arm

.github/workflows/ci.yml

@@ -69,3 +69,13 @@ jobs:
         run: docker build -t fedoracontainer tss-esapi/tests/ --file tss-esapi/tests/Dockerfile-fedora
       - name: Run the tests
         run: docker run -v $(pwd):/tmp/rust-tss-esapi -w /tmp/rust-tss-esapi/tss-esapi fedoracontainer dbus-run-session -- /tmp/rust-tss-esapi/tss-esapi/tests/all-fedora.sh
+
+  tests-valgrind:
+    name: Valgrind test run
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Build the container
+        run: docker build -t ubuntucontainer tss-esapi/tests/ --file tss-esapi/tests/Dockerfile-ubuntu
+      - name: Run the tests
+        run: docker run -v $(pwd):/tmp/rust-tss-esapi -w /tmp/rust-tss-esapi/tss-esapi ubuntucontainer /tmp/rust-tss-esapi/tss-esapi/tests/valgrind.sh

tss-esapi/src/context/tpm_commands/session_commands.rs

@@ -59,6 +59,7 @@ impl Context {
         auth_hash: HashingAlgorithm,
     ) -> Result<Option<AuthSession>> {
         let mut session_handle = ObjectHandle::None.into();
+        let potential_tpm2b_nonce = nonce.map(|v| v.into());
         let ret = unsafe {
             Esys_StartAuthSession(
                 self.mut_context(),
@@ -70,7 +71,7 @@ impl Context {
                 self.optional_session_1(),
                 self.optional_session_2(),
                 self.optional_session_3(),
-                nonce.map_or_else(null, |v| &v.into()),
+                potential_tpm2b_nonce.as_ref().map_or_else(null, |v| v),
                 session_type.into(),
                 &symmetric.try_into()?,
                 auth_hash.into(),

tss-esapi/tests/valgrind.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+# Copyright 2022 Contributors to the Parsec project.
+# SPDX-License-Identifier: Apache-2.0
+
+# Script for running valgrind against the set of tests
+# Intended for running in the Ubuntu container
+
+set -euf -o pipefail
+
+#################################
+# Run the TPM simulation server #
+#################################
+tpm_server &
+sleep 5
+tpm2_startup -c -T mssim
+
+##########################
+# Install cargo-valgrind #
+##########################
+apt install -y valgrind
+cargo install cargo-valgrind
+
+#################
+# Run the tests #
+#################
+TEST_TCTI=mssim: RUST_BACKTRACE=1 RUST_LOG=info cargo valgrind test --  --test-threads=1 --nocapture