shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 10:31:46 +09:00
Code Issues Packages Projects Releases Wiki Activity

selftests/sgx: Fix uninitialized pointer dereferences in encl_get_entry

Browse Source 
[ Upstream commit b84fc2e0139ba4b23b8039bd7cfd242894fe8f8b ]

Ensure sym_tab and sym_names are zero-initialized and add an early-out
condition in the unlikely (erroneous) case that the enclave ELF file would
not contain a symbol table.

This addresses -Werror=maybe-uninitialized compiler warnings for gcc -O2.

Fixes: 33c5aac3bf ("selftests/sgx: Test complete changing of page type flow")
Signed-off-by: Jo Van Bulck <jo.vanbulck@cs.kuleuven.be>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Link: https://lore.kernel.org/all/20231005153854.25566-3-jo.vanbulck%40cs.kuleuven.be
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jo Van Bulck
2023-10-05 17:38:43 +02:00
committed by Greg Kroah-Hartman
parent eb41e7e8b4
commit 2cfae256a1
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/testing/selftests/sgx/load.c
View File

@@ -136,11 +136,11 @@ static bool encl_ioc_add_pages(struct encl *encl, struct encl_segment *seg)
*/ */
uint64_t encl_get_entry(struct encl *encl, const char *symbol) uint64_t encl_get_entry(struct encl *encl, const char *symbol)
{ {
Elf64_Sym *symtab = NULL;
char *sym_names = NULL;
Elf64_Shdr *sections; Elf64_Shdr *sections;
Elf64_Sym *symtab;
Elf64_Ehdr *ehdr; Elf64_Ehdr *ehdr;
char *sym_names; int num_sym = 0;
int num_sym;
int i; int i;
ehdr = encl->bin; ehdr = encl->bin;
@@ -161,6 +161,9 @@ uint64_t encl_get_entry(struct encl *encl, const char *symbol)
} }
} }
if (!symtab || !sym_names)
return 0;
for (i = 0; i < num_sym; i++) { for (i = 0; i < num_sym; i++) {
Elf64_Sym *sym = &symtab[i]; Elf64_Sym *sym = &symtab[i];