From: Reinette Chatre Date: Tue, 8 Feb 2022 21:48:41 +0000 (-0800) Subject: selftests/sgx: Ensure enclave data available during debug print X-Git-Tag: v5.17.2~906 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e4de7bdae6339ef8b13fc65ace4ddf149e338814;p=users%2Fdwmw2%2Flinux.git selftests/sgx: Ensure enclave data available during debug print [ Upstream commit 2db703fc3b15e7ef68c82eca613a3c00d43d70af ] 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 Signed-off-by: Dave Hansen Acked-by: Shuah Khan Link: https://lkml.kernel.org/r/dab672f771e9b99e50c17ae2a75dc0b020cb0ce9.1644355600.git.reinette.chatre@intel.com Signed-off-by: Sasha Levin --- diff --git a/tools/testing/selftests/sgx/main.c b/tools/testing/selftests/sgx/main.c index a7cd2c3e6f7e1..b0bd95a4730d5 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; }