From: Jarkko Sakkinen <jarkko@kernel.org>
To: Reinette Chatre <reinette.chatre@intel.com>
Cc: dave.hansen@linux.intel.com, linux-sgx@vger.kernel.org,
shuah@kernel.org, linux-kselftest@vger.kernel.org
Subject: Re: [PATCH 1/4] selftests/sgx: Fix segfault upon early test failure
Date: Tue, 15 Feb 2022 20:39:34 +0100 [thread overview]
Message-ID: <YgwBdmOnIMCQBhwX@iki.fi> (raw)
In-Reply-To: <3c1d84724ecc7c94131ba1d94dc4c5de5aafc58f.1643393473.git.reinette.chatre@intel.com>
On Fri, Jan 28, 2022 at 10:23:56AM -0800, Reinette Chatre wrote:
> A segfault is encountered if there happens to be an
> early failure of any of the SGX tests. One way to
> reproduce this is to remove the enclave binary
> "test_encl.elf" that will trigger early enclave loading
> failure followed by a segfault.
>
> The segfault occurs within encl_delete() that cleans up
> after an enclave by umapping its mapped regions and closing
> the file descriptor to the SGX driver. As integrated with
> the kselftest harness encl_delete() is called upon exit
> from every test, irrespective of test success. encl_delete()
> is also called to clean up if an error is encountered during
> enclave loading.
>
> encl_delete() is thus responsible for cleaning any amount of
> enclave state - including state that has already been cleaned.
>
> encl_delete() starts by accessing encl->segment_tbl that may
> not have been created yet due to a very early failure or may
> already be cleaned up because of a failure encountered after
> encl->segment_tbl was created.
>
> Ensure encl->segment_tbl is valid before attempting to access
> memory offset from it. The offset with which it is accessed,
> encl->nr_segments, is initialized after encl->segment_tbl and
> thus considered valid to use after the encl->segment_tbl check
> succeeds.
Nit: textwidth=75
Not something I would NAK but just saying.
>
> Fixes: 3200505d4de6 ("selftests/sgx: Create a heap for the test enclave")
> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
> ---
> tools/testing/selftests/sgx/load.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/tools/testing/selftests/sgx/load.c b/tools/testing/selftests/sgx/load.c
> index 9d4322c946e2..006b464c8fc9 100644
> --- a/tools/testing/selftests/sgx/load.c
> +++ b/tools/testing/selftests/sgx/load.c
> @@ -21,7 +21,7 @@
>
> void encl_delete(struct encl *encl)
> {
> - struct encl_segment *heap_seg = &encl->segment_tbl[encl->nr_segments - 1];
> + struct encl_segment *heap_seg;
>
> if (encl->encl_base)
> munmap((void *)encl->encl_base, encl->encl_size);
> @@ -32,10 +32,11 @@ void encl_delete(struct encl *encl)
> if (encl->fd)
> close(encl->fd);
>
> - munmap(heap_seg->src, heap_seg->size);
> -
> - if (encl->segment_tbl)
> + if (encl->segment_tbl) {
> + heap_seg = &encl->segment_tbl[encl->nr_segments - 1];
> + munmap(heap_seg->src, heap_seg->size);
> free(encl->segment_tbl);
> + }
>
> memset(encl, 0, sizeof(*encl));
> }
> --
> 2.25.1
>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Tested-by: Jarkko Sakkinen <jarkko@kernel.org>
I tested this by a minor code mod to trigger to failure case.
/Jarkko
next prev parent reply other threads:[~2022-02-15 19:39 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-28 18:23 [PATCH 0/4] selftests/sgx: Early enclave loading error path fixes Reinette Chatre
2022-01-28 18:23 ` [PATCH 1/4] selftests/sgx: Fix segfault upon early test failure Reinette Chatre
2022-01-28 18:43 ` Dave Hansen
2022-01-28 19:22 ` Reinette Chatre
2022-01-28 19:26 ` Dave Hansen
2022-01-28 20:08 ` Reinette Chatre
2022-02-15 19:39 ` Jarkko Sakkinen [this message]
2022-01-28 18:23 ` [PATCH 2/4] selftests/sgx: Do not attempt enclave build without valid enclave Reinette Chatre
2022-01-28 19:03 ` Dave Hansen
2022-01-28 19:23 ` Reinette Chatre
2022-02-15 19:35 ` Jarkko Sakkinen
2022-01-28 18:23 ` [PATCH 3/4] selftests/sgx: Ensure enclave data available during debug print Reinette Chatre
2022-01-28 19:06 ` Dave Hansen
2022-01-28 19:40 ` Reinette Chatre
2022-02-15 19:35 ` Jarkko Sakkinen
2022-01-28 18:23 ` [PATCH 4/4] selftests/sgx: Remove extra newlines in test output Reinette Chatre
2022-01-28 19:07 ` Dave Hansen
2022-02-15 19:34 ` Jarkko Sakkinen
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=YgwBdmOnIMCQBhwX@iki.fi \
--to=jarkko@kernel.org \
--cc=dave.hansen@linux.intel.com \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-sgx@vger.kernel.org \
--cc=reinette.chatre@intel.com \
--cc=shuah@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;
as well as URLs for NNTP newsgroup(s).