summaryrefslogtreecommitdiffstats
path: root/tools/testing/selftests/sgx
diff options
context:
space:
mode:
authorReinette Chatre <reinette.chatre@intel.com>2022-02-08 22:48:41 +0100
committerDave Hansen <dave.hansen@linux.intel.com>2022-02-11 22:52:47 +0100
commit2db703fc3b15e7ef68c82eca613a3c00d43d70af (patch)
tree5d51766241e4ff9326e2375a0d832de6fcd4fbdc /tools/testing/selftests/sgx
parentselftests/sgx: Do not attempt enclave build without valid enclave (diff)
downloadlinux-2db703fc3b15e7ef68c82eca613a3c00d43d70af.tar.xz
linux-2db703fc3b15e7ef68c82eca613a3c00d43d70af.zip
selftests/sgx: Ensure enclave data available during debug print
In support of debugging the SGX tests print details from the enclave and its memory mappings if any failure is encountered during enclave loading. When a failure is encountered no data is printed because the printing of the data is preceded by cleanup of the data. Move the data cleanup after the data print. Fixes: 147172148909 ("selftests/sgx: Dump segments and /proc/self/maps only on failure") Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Acked-by: Shuah Khan <skhan@linuxfoundation.org> Link: https://lkml.kernel.org/r/dab672f771e9b99e50c17ae2a75dc0b020cb0ce9.1644355600.git.reinette.chatre@intel.com
Diffstat (limited to 'tools/testing/selftests/sgx')
-rw-r--r--tools/testing/selftests/sgx/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testing/selftests/sgx/main.c b/tools/testing/selftests/sgx/main.c
index a7cd2c3e6f7e..b0bd95a4730d 100644
--- a/tools/testing/selftests/sgx/main.c
+++ b/tools/testing/selftests/sgx/main.c
@@ -186,8 +186,6 @@ static bool setup_test_encl(unsigned long heap_size, struct encl *encl,
return true;
err:
- encl_delete(encl);
-
for (i = 0; i < encl->nr_segments; i++) {
seg = &encl->segment_tbl[i];
@@ -208,6 +206,8 @@ err:
TH_LOG("Failed to initialize the test enclave.\n");
+ encl_delete(encl);
+
return false;
}