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 0/5] x86/sgx: Fix lock ordering bug w/ EADD
Date: Tue, 27 Aug 2019 12:27:12 -0700 [thread overview]
Message-ID: <20190827192717.27312-1-sean.j.christopherson@intel.com> (raw)
As discovered by Jarkko, taking mm->mmap_sem around EADD can lead to
deadlock as attempting to acquire mmap_sem while holding encl->lock
violates SGX's lock ordering.
Resolving the issue simply by reversing the lock ordering gets ugly due
to the behavior of sgx_encl_grow(), which has a path that drops encl->lock
in order to do EPC page reclaim, i.e. moving mm->mmap_sem up would require
it to be dropped and reacquired as well.
Luckily, the entire flow can be simplified by preventing userspace from
invoking concurrent ioctls on a single enclave. Requiring ioctls to be
serialized means encl->lock doesn't need to be held to grow/shrink the
enclave, since only ioctls can grow/shrink the enclave. This also
eliminates theoretical cases that sgx_encl_grow() has to handle, e.g. the
enclave being initialized while it's waiting on reclaim, since the
protection provided by serializing ioctls isn't dropped to do reclaim.
v2:
- Make encl->flags an atomic, reuse for "in ioctl" detection. [Jarkko]
- Drop smp_{r,w}mb() patch as it is superceded by atomic flags. [Jarkko]
- Tack on two interdependent bug fixes found when auditing encl->flags.
- Rebase to Jarkko's latest master.
Sean Christopherson (5):
x86/sgx: Convert encl->flags from an unsigned int to an atomic
x86/sgx: Reject concurrent ioctls on single enclave
x86/sgx: Take encl->lock inside of mm->mmap_sem for EADD
x86/sgx: Reject all ioctls on dead enclaves
x86/sgx: Destroy the enclave if EEXTEND fails
arch/x86/kernel/cpu/sgx/driver.c | 3 +-
arch/x86/kernel/cpu/sgx/encl.c | 18 ++--
arch/x86/kernel/cpu/sgx/encl.h | 3 +-
arch/x86/kernel/cpu/sgx/ioctl.c | 163 ++++++++++++++++--------------
arch/x86/kernel/cpu/sgx/reclaim.c | 10 +-
5 files changed, 105 insertions(+), 92 deletions(-)
--
2.22.0
next 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 Sean Christopherson [this message]
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 ` [PATCH v2 3/5] x86/sgx: Take encl->lock inside of mm->mmap_sem for EADD Sean Christopherson
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-1-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).