Skip to content

Commit

Permalink
selftests/sgx: Fix NULL-pointer-dereference upon early test failure
Browse files Browse the repository at this point in the history
[ Upstream commit 2d03861 ]

== Background ==

The SGX selftests track parts of the enclave binaries in an array:
encl->segment_tbl[]. That array is dynamically allocated early
(but not first) in the test's lifetime. The array is referenced
at the end of the test in encl_delete().

== Problem ==

encl->segment_tbl[] can be NULL if the test fails before its
allocation. That leads to a NULL-pointer-dereference in encl_delete().
This is triggered during early failures of the selftest like if the
enclave binary ("test_encl.elf") is deleted.

== Solution ==

Ensure encl->segment_tbl[] is valid before attempting to access
its members. The offset with which it is accessed, encl->nr_segments,
is initialized before encl->segment_tbl[] and thus considered valid
to use after the encl->segment_tbl[] check succeeds.

Fixes: 3200505 ("selftests/sgx: Create a heap for the test enclave")
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/90a31dfd640ea756fa324712e7cbab4a90fa7518.1644355600.git.reinette.chatre@intel.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
rchatre authored and gregkh committed Apr 8, 2022
1 parent 704404d commit bc72277
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions tools/testing/selftests/sgx/load.c
Expand Up @@ -21,7 +21,7 @@

void encl_delete(struct encl *encl)
{
struct encl_segment *heap_seg = &encl->segment_tbl[encl->nr_segments - 1];
struct encl_segment *heap_seg;

if (encl->encl_base)
munmap((void *)encl->encl_base, encl->encl_size);
Expand All @@ -32,10 +32,11 @@ void encl_delete(struct encl *encl)
if (encl->fd)
close(encl->fd);

munmap(heap_seg->src, heap_seg->size);

if (encl->segment_tbl)
if (encl->segment_tbl) {
heap_seg = &encl->segment_tbl[encl->nr_segments - 1];
munmap(heap_seg->src, heap_seg->size);
free(encl->segment_tbl);
}

memset(encl, 0, sizeof(*encl));
}
Expand Down

0 comments on commit bc72277

Please sign in to comment.