Intel SGX development
 help / color / mirror / Atom feed
From: Jo Van Bulck <jo.vanbulck@cs.kuleuven.be>
To: jarkko@kernel.org, kai.huang@intel.com,
	linux-sgx@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: dave.hansen@linux.intel.com, Jo Van Bulck <jo.vanbulck@cs.kuleuven.be>
Subject: [PATCH v4 03/13] selftests/sgx: Handle relocations in test enclave
Date: Fri, 25 Aug 2023 15:32:42 +0200	[thread overview]
Message-ID: <20230825133252.9056-4-jo.vanbulck@cs.kuleuven.be> (raw)
In-Reply-To: <20230825133252.9056-1-jo.vanbulck@cs.kuleuven.be>

Static-pie binaries normally include a startup routine to perform any ELF
relocations from .rela.dyn. Since the enclave loading process is different
and glibc is not included, do the necessary relocation for encl_op_array
entries manually at runtime relative to the enclave base to ensure correct
function pointers.

Signed-off-by: Jo Van Bulck <jo.vanbulck@cs.kuleuven.be>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
---
 tools/testing/selftests/sgx/test_encl.c | 48 +++++++++++++++++--------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/tools/testing/selftests/sgx/test_encl.c b/tools/testing/selftests/sgx/test_encl.c
index c0d6397295e3..706c1f7260ff 100644
--- a/tools/testing/selftests/sgx/test_encl.c
+++ b/tools/testing/selftests/sgx/test_encl.c
@@ -119,21 +119,39 @@ static void do_encl_op_nop(void *_op)
 
 }
 
+/*
+ * Symbol placed at the start of the enclave image by the linker script.
+ * Declare this extern symbol with visibility "hidden" to ensure the
+ * compiler does not access it through the GOT.
+ */
+extern const uint8_t __attribute__((visibility("hidden"))) __encl_base;
+
+typedef void (*encl_op_t)(void *);
+static const encl_op_t encl_op_array[ENCL_OP_MAX] = {
+	do_encl_op_put_to_buf,
+	do_encl_op_get_from_buf,
+	do_encl_op_put_to_addr,
+	do_encl_op_get_from_addr,
+	do_encl_op_nop,
+	do_encl_eaccept,
+	do_encl_emodpe,
+	do_encl_init_tcs_page,
+};
+
 void encl_body(void *rdi,  void *rsi)
 {
-	const void (*encl_op_array[ENCL_OP_MAX])(void *) = {
-		do_encl_op_put_to_buf,
-		do_encl_op_get_from_buf,
-		do_encl_op_put_to_addr,
-		do_encl_op_get_from_addr,
-		do_encl_op_nop,
-		do_encl_eaccept,
-		do_encl_emodpe,
-		do_encl_init_tcs_page,
-	};
-
-	struct encl_op_header *op = (struct encl_op_header *)rdi;
-
-	if (op->type < ENCL_OP_MAX)
-		(*encl_op_array[op->type])(op);
+	struct encl_op_header *header = (struct encl_op_header *)rdi;
+	encl_op_t op;
+
+	if (header->type >= ENCL_OP_MAX)
+		return;
+
+	/*
+	 * The enclave base address needs to be added, as this call site
+	 * *cannot be* made rip-relative by the compiler, or fixed up by
+	 * any other possible means.
+	 */
+	op = ((uint64_t)&__encl_base) + encl_op_array[header->type];
+
+	(*op)(header);
 }
-- 
2.25.1


  parent reply	other threads:[~2023-08-25 13:33 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-25 13:32 [PATCH v4 00/13] selftests/sgx: Fix compilation errors Jo Van Bulck
2023-08-25 13:32 ` [PATCH v4 01/13] selftests/sgx: Fix uninitialized pointer dereference in error path Jo Van Bulck
2023-08-25 13:32 ` [PATCH v4 02/13] selftests/sgx: Produce static-pie executable for test enclave Jo Van Bulck
2023-08-29 10:55   ` Huang, Kai
2023-08-31  8:49     ` Jo Van Bulck
2023-08-25 13:32 ` Jo Van Bulck [this message]
2023-08-28 13:15   ` [PATCH v4 03/13] selftests/sgx: Handle relocations in " Huang, Kai
2023-08-31 12:48     ` Jo Van Bulck
2023-08-25 13:32 ` [PATCH v4 04/13] selftests/sgx: Fix linker script asserts Jo Van Bulck
2023-08-25 13:32 ` [PATCH v4 05/13] selftests/sgx: Include memory clobber for inline asm in test enclave Jo Van Bulck
2023-08-29 11:07   ` Huang, Kai
2023-08-31  8:31     ` Jo Van Bulck
2023-08-25 13:32 ` [PATCH v4 06/13] selftests/sgx: Ensure test enclave buffer is entirely preserved Jo Van Bulck
2023-08-25 13:32 ` [PATCH v4 07/13] selftests/sgx: Ensure expected location of test enclave buffer Jo Van Bulck
2023-08-25 13:32 ` [PATCH v4 08/13] selftests/sgx: Separate linker options Jo Van Bulck
2023-08-25 13:32 ` [PATCH v4 09/13] selftests/sgx: Specify freestanding environment for enclave compilation Jo Van Bulck
2023-08-27 18:35   ` Jarkko Sakkinen
2023-08-25 13:32 ` [PATCH v4 10/13] selftests/sgx: Fix uninitialized pointer dereferences Jo Van Bulck
2023-08-27 18:36   ` Jarkko Sakkinen
2023-08-31  8:12     ` Jo Van Bulck
2023-08-25 13:32 ` [PATCH v4 11/13] selftests/sgx: Discard unsupported ELF sections Jo Van Bulck
2023-08-25 13:32 ` [PATCH v4 12/13] selftests/sgx: Remove redundant enclave base address save/restore Jo Van Bulck
2023-08-29 11:00   ` Huang, Kai
2023-08-31  8:25     ` Jo Van Bulck
2023-08-25 13:32 ` [PATCH v4 13/13] selftests/sgx: Remove incomplete ABI sanitization code in test enclave Jo Van Bulck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230825133252.9056-4-jo.vanbulck@cs.kuleuven.be \
    --to=jo.vanbulck@cs.kuleuven.be \
    --cc=dave.hansen@linux.intel.com \
    --cc=jarkko@kernel.org \
    --cc=kai.huang@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sgx@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox