Patch "selftests/sgx: Fix uninitialized pointer dereferences in encl_get_entry" has been added to the 6.7-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    selftests/sgx: Fix uninitialized pointer dereferences in encl_get_entry

to the 6.7-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     selftests-sgx-fix-uninitialized-pointer-dereferences.patch
and it can be found in the queue-6.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 7d8afe1d83d711b73027e2171da66def5aceb122
Author: Jo Van Bulck <jo.vanbulck@xxxxxxxxxxxxxx>
Date:   Thu Oct 5 17:38:43 2023 +0200

    selftests/sgx: Fix uninitialized pointer dereferences in encl_get_entry
    
    [ 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: 33c5aac3bf32 ("selftests/sgx: Test complete changing of page type flow")
    Signed-off-by: Jo Van Bulck <jo.vanbulck@xxxxxxxxxxxxxx>
    Signed-off-by: Dave Hansen <dave.hansen@xxxxxxxxxxxxxxx>
    Reviewed-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx>
    Link: https://lore.kernel.org/all/20231005153854.25566-3-jo.vanbulck%40cs.kuleuven.be
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/testing/selftests/sgx/load.c b/tools/testing/selftests/sgx/load.c
index 94bdeac1cf04..c9f658e44de6 100644
--- a/tools/testing/selftests/sgx/load.c
+++ b/tools/testing/selftests/sgx/load.c
@@ -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)
 {
+	Elf64_Sym *symtab = NULL;
+	char *sym_names = NULL;
 	Elf64_Shdr *sections;
-	Elf64_Sym *symtab;
 	Elf64_Ehdr *ehdr;
-	char *sym_names;
-	int num_sym;
+	int num_sym = 0;
 	int i;
 
 	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++) {
 		Elf64_Sym *sym = &symtab[i];