From: Sean Christopherson <sean.j.christopherson@intel.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: linux-sgx@vger.kernel.org,
Shay Katz-zamir <shay.katz-zamir@intel.com>,
Serge Ayoun <serge.ayoun@intel.com>
Subject: [PATCH for_v22 08/11] x86/sgx: Do not free enclave resources on redundant ECREATE
Date: Wed, 7 Aug 2019 17:12:51 -0700 [thread overview]
Message-ID: <20190808001254.11926-9-sean.j.christopherson@intel.com> (raw)
In-Reply-To: <20190808001254.11926-1-sean.j.christopherson@intel.com>
Fix a bug where sgx_encl_create() incorrectly frees the enclave's SECS
and backing storage when the enclave has already been created. Freeing
the structures leads to various forms of faults due to dereferencing
null pointers.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
arch/x86/kernel/cpu/sgx/driver/ioctl.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/sgx/driver/ioctl.c b/arch/x86/kernel/cpu/sgx/driver/ioctl.c
index 700d65c96b9a..18f6925ab2ed 100644
--- a/arch/x86/kernel/cpu/sgx/driver/ioctl.c
+++ b/arch/x86/kernel/cpu/sgx/driver/ioctl.c
@@ -277,7 +277,7 @@ static int sgx_encl_create(struct sgx_encl *encl, struct sgx_secs *secs)
if (encl->flags & SGX_ENCL_CREATED) {
ret = -EFAULT;
- goto err_out;
+ goto err_out_unlock;
}
ssaframesize = sgx_calc_ssaframesize(secs->miscselect, secs->xfrm);
@@ -348,6 +348,7 @@ static int sgx_encl_create(struct sgx_encl *encl, struct sgx_secs *secs)
encl->backing = NULL;
}
+err_out_unlock:
mutex_unlock(&encl->lock);
return ret;
}
--
2.22.0
next prev parent reply other threads:[~2019-08-08 0:12 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-08 0:12 [PATCH for_v22 00/11] x86/sgx: Bug fixes for v22 Sean Christopherson
2019-08-08 0:12 ` [PATCH for_v22 01/11] x86/sgx: Fix an SECS collision with enclave page at VA=0 Sean Christopherson
2019-08-08 15:34 ` Jarkko Sakkinen
2019-08-08 15:44 ` Sean Christopherson
2019-08-09 15:13 ` Jarkko Sakkinen
2019-08-09 20:44 ` Jarkko Sakkinen
2019-08-09 20:59 ` Jarkko Sakkinen
2019-08-08 0:12 ` [PATCH for_v22 02/11] x86/sgx: Fix incorrect NULL pointer check Sean Christopherson
2019-08-08 15:36 ` Jarkko Sakkinen
2019-08-09 21:16 ` Jarkko Sakkinen
2019-08-08 0:12 ` [PATCH for_v22 03/11] x86/sgx: Return '0' when sgx_ioc_enclave_set_attribute() succeeds Sean Christopherson
2019-08-08 15:37 ` Jarkko Sakkinen
2019-08-08 0:12 ` [PATCH for_v22 04/11] x86/sgx: x86/sgx: Require EADD destination to be page aligned Sean Christopherson
2019-08-08 15:38 ` Jarkko Sakkinen
2019-08-08 0:12 ` [PATCH for_v22 05/11] x86/sgx: Require EADD source " Sean Christopherson
2019-08-08 15:44 ` Jarkko Sakkinen
2019-08-08 0:12 ` [PATCH for_v22 06/11] x86/sgx: Check the bounds of the enclave address against ELRANGE Sean Christopherson
2019-08-08 15:45 ` Jarkko Sakkinen
2019-08-09 21:21 ` Jarkko Sakkinen
2019-08-08 0:12 ` [PATCH for_v22 07/11] x86/sgx: Check that enclave is created at beginning of EADD/EINIT ioctl Sean Christopherson
2019-08-08 15:47 ` Jarkko Sakkinen
2019-08-09 23:40 ` Jarkko Sakkinen
2019-08-10 0:03 ` Sean Christopherson
2019-08-10 0:10 ` Sean Christopherson
2019-08-08 0:12 ` Sean Christopherson [this message]
2019-08-08 15:48 ` [PATCH for_v22 08/11] x86/sgx: Do not free enclave resources on redundant ECREATE Jarkko Sakkinen
2019-08-08 0:12 ` [PATCH for_v22 09/11] x86/sgx: Refactor error handling for user of sgx_encl_grow() Sean Christopherson
2019-08-08 15:49 ` Jarkko Sakkinen
2019-08-08 0:12 ` [PATCH for_v22 10/11] x86/sgx: Call sgx_encl_grow() with the enclave's lock held Sean Christopherson
2019-08-08 15:52 ` Jarkko Sakkinen
2019-08-08 15:55 ` Sean Christopherson
2019-08-09 16:12 ` Jarkko Sakkinen
2019-08-10 11:32 ` Jarkko Sakkinen
2019-08-08 0:12 ` [PATCH for_v22 11/11] x86/sgx: Shrink the enclave if ECREATE/EADD fails Sean Christopherson
2019-08-08 15:50 ` Jarkko Sakkinen
2019-08-08 18:03 ` Sean Christopherson
2019-08-09 16:13 ` Jarkko Sakkinen
2019-08-10 11:37 ` Jarkko Sakkinen
2019-08-08 15:18 ` [PATCH for_v22 00/11] x86/sgx: Bug fixes for v22 Jarkko Sakkinen
2019-08-08 15:57 ` Jarkko Sakkinen
2019-08-10 11:44 ` 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=20190808001254.11926-9-sean.j.christopherson@intel.com \
--to=sean.j.christopherson@intel.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=linux-sgx@vger.kernel.org \
--cc=serge.ayoun@intel.com \
--cc=shay.katz-zamir@intel.com \
/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).