From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 244491339A8; Tue, 23 Jan 2024 01:05:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705971906; cv=none; b=lnFRnpureJF/vj1vZNVVhOmqWQD6c1bVN9V0Fata5JImtuhWm6LTR0Hun2gyxalZfIuqu0Ua0ZC0DYtnWwdMFNqbMjrgeaDcokEfyn5/ptMkg1O7XS5oMDSYA7SWwy96qdJ5I+sdaemZXF25cJaeQqga1WJfREaEgyib/c5iMWI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705971906; c=relaxed/simple; bh=jMV+V8hMvJB4zRrQEAEo9Z1PGnjXLwh1K4tfbKJQTLs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lid8DL5J3wI82sEZUE1AEcVMDk1vRcmmaQoER5Pb/TUWfa1B4h7IYrM7xv62xUhaC8JBSupvq31W5+BBuilOw+AK9ZaqfQfMld31Cyw2YXferTN0hcLWroxwM6vCP+fuhp5m4gyKrCgnSJE2OONLvRuqeTiO9qk/z+PAzBrwxbs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zYSYOkeE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="zYSYOkeE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D76B2C433C7; Tue, 23 Jan 2024 01:05:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705971906; bh=jMV+V8hMvJB4zRrQEAEo9Z1PGnjXLwh1K4tfbKJQTLs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zYSYOkeEYRLXRIo2uyHsREkiKtKPp8ag9TnYkl/qAfZnXikaZK0DnOtI1/KXON2v4 WRoEn1WHdS8PHSXAluZt6ICO7NAW31Bxnql6cAXlx6ak8LmRIWYZn4AkY35sZRiGt7 TYAGqq1mXWT8V6TwxjWCKR9ALQt0o7pgVmqDGhwc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jo Van Bulck , Dave Hansen , Jarkko Sakkinen , Sasha Levin Subject: [PATCH 6.1 347/417] selftests/sgx: Fix uninitialized pointer dereferences in encl_get_entry Date: Mon, 22 Jan 2024 15:58:35 -0800 Message-ID: <20240122235803.803893506@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235751.480367507@linuxfoundation.org> References: <20240122235751.480367507@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jo Van Bulck [ 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 Signed-off-by: Dave Hansen Reviewed-by: Jarkko Sakkinen Link: https://lore.kernel.org/all/20231005153854.25566-3-jo.vanbulck%40cs.kuleuven.be Signed-off-by: Sasha Levin --- tools/testing/selftests/sgx/load.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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]; -- 2.43.0