selftests/sgx: Do not attempt enclave build without valid enclave

rchatre · hansendc · commit fff36bcbfde1 · 2022-02-11T13:52:47.000-08:00
It is not possible to build an enclave if it was not possible to load the binary from which it should be constructed. Do not attempt to make further progress but instead return with failure. A "return false" from setup_test_encl() is expected to trip an ASSERT_TRUE() and abort the rest of the test. Fixes: 1b35eb7 ("selftests/sgx: Encpsulate the test enclave creation") Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> Acked-by: Dave Hansen <dave.hansen@linux.intel.com> Acked-by: Shuah Khan <skhan@linuxfoundation.org> Link: https://lkml.kernel.org/r/e3778c77f95e6dca348c732b12f155051d2899b4.1644355600.git.reinette.chatre@intel.com
diff --git a/tools/testing/selftests/sgx/main.c b/tools/testing/selftests/sgx/main.c
@@ -147,6 +147,7 @@ static bool setup_test_encl(unsigned long heap_size, struct encl *encl,
 	if (!encl_load("test_encl.elf", encl, heap_size)) {
 		encl_delete(encl);
 		TH_LOG("Failed to load the test enclave.\n");
+		return false;
 	}
 
 	if (!encl_measure(encl))

Original file line number	Diff line number	Diff line change
`@@ -147,6 +147,7 @@ static bool setup_test_encl(unsigned long heap_size, struct encl *encl,`
`147`	`147`	`if (!encl_load("test_encl.elf", encl, heap_size)) {`
`148`	`148`	`encl_delete(encl);`
`149`	`149`	`TH_LOG("Failed to load the test enclave.\n");`
	`150`	`+ return false;`
`150`	`151`	`}`
`151`	`152`
`152`	`153`	`if (!encl_measure(encl))`