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 02/13] selftests/sgx: Produce static-pie executable for test enclave
Date: Fri, 25 Aug 2023 15:32:41 +0200 [thread overview]
Message-ID: <20230825133252.9056-3-jo.vanbulck@cs.kuleuven.be> (raw)
In-Reply-To: <20230825133252.9056-1-jo.vanbulck@cs.kuleuven.be>
The current combination of -static and -fPIC creates a static executable
with position-dependent addresses for global variables. Use -static-pie
and -fPIE to create a proper static position independent executable that
can be loaded at any address without a dynamic linker.
Link: https://lore.kernel.org/all/f9c24d89-ed72-7d9e-c650-050d722c6b04@cs.kuleuven.be/
Signed-off-by: Jo Van Bulck <jo.vanbulck@cs.kuleuven.be>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
---
tools/testing/selftests/sgx/Makefile | 2 +-
tools/testing/selftests/sgx/test_encl.lds | 1 +
tools/testing/selftests/sgx/test_encl_bootstrap.S | 9 ++++++---
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/tools/testing/selftests/sgx/Makefile b/tools/testing/selftests/sgx/Makefile
index 50aab6b57da3..1d6315a2e5f5 100644
--- a/tools/testing/selftests/sgx/Makefile
+++ b/tools/testing/selftests/sgx/Makefile
@@ -13,7 +13,7 @@ endif
INCLUDES := -I$(top_srcdir)/tools/include
HOST_CFLAGS := -Wall -Werror -g $(INCLUDES) -fPIC -z noexecstack
-ENCL_CFLAGS := -Wall -Werror -static -nostdlib -nostartfiles -fPIC \
+ENCL_CFLAGS := -Wall -Werror -static-pie -nostdlib -nostartfiles -fPIE \
-fno-stack-protector -mrdrnd $(INCLUDES)
TEST_CUSTOM_PROGS := $(OUTPUT)/test_sgx
diff --git a/tools/testing/selftests/sgx/test_encl.lds b/tools/testing/selftests/sgx/test_encl.lds
index a1ec64f7d91f..62d37160f59b 100644
--- a/tools/testing/selftests/sgx/test_encl.lds
+++ b/tools/testing/selftests/sgx/test_encl.lds
@@ -10,6 +10,7 @@ PHDRS
SECTIONS
{
. = 0;
+ __encl_base = .;
.tcs : {
*(.tcs*)
} : tcs
diff --git a/tools/testing/selftests/sgx/test_encl_bootstrap.S b/tools/testing/selftests/sgx/test_encl_bootstrap.S
index 03ae0f57e29d..4e55d91566c4 100644
--- a/tools/testing/selftests/sgx/test_encl_bootstrap.S
+++ b/tools/testing/selftests/sgx/test_encl_bootstrap.S
@@ -42,9 +42,12 @@
encl_entry:
# RBX contains the base address for TCS, which is the first address
# inside the enclave for TCS #1 and one page into the enclave for
- # TCS #2. By adding the value of encl_stack to it, we get
- # the absolute address for the stack.
- lea (encl_stack)(%rbx), %rax
+ # TCS #2. First make it relative by substracting __encl_base and
+ # then add the address of encl_stack to get the address for the stack.
+ lea __encl_base(%rip), %rax
+ sub %rax, %rbx
+ lea encl_stack(%rip), %rax
+ add %rbx, %rax
jmp encl_entry_core
encl_dyn_entry:
# Entry point for dynamically created TCS page expected to follow
--
2.25.1
next prev 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 ` Jo Van Bulck [this message]
2023-08-29 10:55 ` [PATCH v4 02/13] selftests/sgx: Produce static-pie executable for test enclave Huang, Kai
2023-08-31 8:49 ` Jo Van Bulck
2023-08-25 13:32 ` [PATCH v4 03/13] selftests/sgx: Handle relocations in " Jo Van Bulck
2023-08-28 13:15 ` 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-3-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