From: Sean Christopherson <sean.j.christopherson@intel.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: linux-sgx@vger.kernel.org
Subject: [PATCH v2 3/5] x86/sgx: Take encl->lock inside of mm->mmap_sem for EADD
Date: Tue, 27 Aug 2019 12:27:15 -0700 [thread overview]
Message-ID: <20190827192717.27312-4-sean.j.christopherson@intel.com> (raw)
In-Reply-To: <20190827192717.27312-1-sean.j.christopherson@intel.com>
Reverse the order in which encl->lock and mm->mmap_sem are taken during
ENCLAVE_ADD_PAGE so as to adhere to SGX's lock ordering requirements.
Refactor EEXTEND and the final bookeeping out of __sgx_encl_add_page()
so that mm->mmap_sem can be dropped after EADD without spreading the
lock/unlock across multiple functions.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
arch/x86/kernel/cpu/sgx/ioctl.c | 55 ++++++++++++++++++++-------------
1 file changed, 33 insertions(+), 22 deletions(-)
diff --git a/arch/x86/kernel/cpu/sgx/ioctl.c b/arch/x86/kernel/cpu/sgx/ioctl.c
index 1ce8e3021a5c..a0ffbbb0dad1 100644
--- a/arch/x86/kernel/cpu/sgx/ioctl.c
+++ b/arch/x86/kernel/cpu/sgx/ioctl.c
@@ -307,43 +307,40 @@ static int sgx_validate_secinfo(struct sgx_secinfo *secinfo)
static int __sgx_encl_add_page(struct sgx_encl *encl,
struct sgx_encl_page *encl_page,
struct sgx_epc_page *epc_page,
- struct sgx_secinfo *secinfo, unsigned long src,
- unsigned long mrmask)
+ struct sgx_secinfo *secinfo, unsigned long src)
{
struct sgx_pageinfo pginfo;
struct vm_area_struct *vma;
int ret;
- int i;
pginfo.secs = (unsigned long)sgx_epc_addr(encl->secs.epc_page);
pginfo.addr = SGX_ENCL_PAGE_ADDR(encl_page);
pginfo.metadata = (unsigned long)secinfo;
pginfo.contents = src;
- down_read(¤t->mm->mmap_sem);
-
/* Query vma's VM_MAYEXEC as an indirect path_noexec() check. */
if (encl_page->vm_max_prot_bits & VM_EXEC) {
vma = find_vma(current->mm, src);
- if (!vma) {
- up_read(¤t->mm->mmap_sem);
+ if (!vma)
return -EFAULT;
- }
- if (!(vma->vm_flags & VM_MAYEXEC)) {
- up_read(¤t->mm->mmap_sem);
+ if (!(vma->vm_flags & VM_MAYEXEC))
return -EACCES;
- }
}
__uaccess_begin();
ret = __eadd(&pginfo, sgx_epc_addr(epc_page));
__uaccess_end();
- up_read(¤t->mm->mmap_sem);
+ return ret ? -EFAULT : 0;
+}
- if (ret)
- return -EFAULT;
+static int __sgx_encl_extend(struct sgx_encl *encl,
+ struct sgx_epc_page *epc_page,
+ unsigned long mrmask)
+{
+ int ret;
+ int i;
for_each_set_bit(i, &mrmask, 16) {
ret = __eextend(sgx_epc_addr(encl->secs.epc_page),
@@ -354,12 +351,6 @@ static int __sgx_encl_add_page(struct sgx_encl *encl,
return -EFAULT;
}
}
-
- encl_page->encl = encl;
- encl_page->epc_page = epc_page;
- encl->secs_child_cnt++;
- sgx_mark_page_reclaimable(encl_page->epc_page);
-
return 0;
}
@@ -388,19 +379,39 @@ static int sgx_encl_add_page(struct sgx_encl *encl,
goto err_out_free;
}
+ down_read(¤t->mm->mmap_sem);
+
mutex_lock(&encl->lock);
+ /*
+ * Insert prior to EADD in case of OOM. EADD modifies MRENCLAVE, i.e.
+ * can't be gracefully unwound, while failure on EADD/EXTEND is limited
+ * to userspace errors (or kernel/hardware bugs).
+ */
ret = radix_tree_insert(&encl->page_tree, PFN_DOWN(encl_page->desc),
encl_page);
- if (ret)
+ if (ret) {
+ up_read(¤t->mm->mmap_sem);
goto err_out_shrink;
+ }
ret = __sgx_encl_add_page(encl, encl_page, epc_page, secinfo,
- addp->src, addp->mrmask);
+ addp->src);
+ up_read(¤t->mm->mmap_sem);
+
+ if (ret)
+ goto err_out;
+
+ ret = __sgx_encl_extend(encl, epc_page, addp->mrmask);
if (ret)
goto err_out;
+ encl_page->encl = encl;
+ encl_page->epc_page = epc_page;
+ encl->secs_child_cnt++;
+ sgx_mark_page_reclaimable(encl_page->epc_page);
mutex_unlock(&encl->lock);
+
return 0;
err_out:
--
2.22.0
next prev parent reply other threads:[~2019-08-27 19:27 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-27 19:27 [PATCH v2 0/5] x86/sgx: Fix lock ordering bug w/ EADD Sean Christopherson
2019-08-27 19:27 ` [PATCH v2 1/5] x86/sgx: Convert encl->flags from an unsigned int to an atomic Sean Christopherson
2019-08-29 13:09 ` Jarkko Sakkinen
2019-08-29 15:59 ` Sean Christopherson
2019-08-29 18:01 ` Jarkko Sakkinen
2019-08-30 0:02 ` Sean Christopherson
2019-08-27 19:27 ` [PATCH v2 2/5] x86/sgx: Reject concurrent ioctls on single enclave Sean Christopherson
2019-08-29 13:15 ` Jarkko Sakkinen
2019-08-29 16:00 ` Sean Christopherson
2019-08-29 18:14 ` Jarkko Sakkinen
2019-08-29 18:43 ` Sean Christopherson
2019-08-29 22:22 ` Jarkko Sakkinen
2019-08-27 19:27 ` Sean Christopherson [this message]
2019-08-27 19:27 ` [PATCH v2 4/5] x86/sgx: Reject all ioctls on dead enclaves Sean Christopherson
2019-08-27 19:27 ` [PATCH v2 5/5] x86/sgx: Destroy the enclave if EEXTEND fails Sean Christopherson
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=20190827192717.27312-4-sean.j.christopherson@intel.com \
--to=sean.j.christopherson@intel.com \
--cc=jarkko.sakkinen@linux.intel.com \
--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;
as well as URLs for NNTP newsgroup(s).