From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: linux-sgx@vger.kernel.org
Cc: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
Sean Christopherson <sean.j.christpherson@intel.com>,
Shay Katz-zamir <shay.katz-zamir@intel.com>,
Serge Ayoun <serge.ayoun@intel.com>
Subject: [PATCH 1/5] x86/sgx: Document permission handling better
Date: Mon, 19 Aug 2019 18:25:40 +0300 [thread overview]
Message-ID: <20190819152544.7296-2-jarkko.sakkinen@linux.intel.com> (raw)
In-Reply-To: <20190819152544.7296-1-jarkko.sakkinen@linux.intel.com>
The way permissions are managed inside the driver is not trivial and
intuitive. The non-obvious parts were not properly remarked in the
source code. This patch refines them a bit.
Cc: Sean Christopherson <sean.j.christpherson@intel.com>
Cc: Shay Katz-zamir <shay.katz-zamir@intel.com>
Cc: Serge Ayoun <serge.ayoun@intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
arch/x86/kernel/cpu/sgx/driver/ioctl.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/sgx/driver/ioctl.c b/arch/x86/kernel/cpu/sgx/driver/ioctl.c
index 9b784a061a47..64d3286f3324 100644
--- a/arch/x86/kernel/cpu/sgx/driver/ioctl.c
+++ b/arch/x86/kernel/cpu/sgx/driver/ioctl.c
@@ -259,7 +259,10 @@ static struct sgx_encl_page *sgx_encl_page_alloc(struct sgx_encl *encl,
return ERR_PTR(-ENOMEM);
encl_page->desc = addr;
encl_page->encl = encl;
+
+ /* Calculate maximum of the VM flags for the page. */
encl_page->vm_prot_bits = calc_vm_prot_bits(prot, 0);
+
ret = radix_tree_insert(&encl->page_tree, PFN_DOWN(encl_page->desc),
encl_page);
if (ret) {
@@ -640,11 +643,15 @@ static long sgx_ioc_enclave_add_page(struct file *filep, void __user *arg)
data = kmap(data_page);
+ /* Set prot bits matching to the SECINFO permissions. */
prot = _calc_vm_trans(secinfo.flags, SGX_SECINFO_R, PROT_READ) |
_calc_vm_trans(secinfo.flags, SGX_SECINFO_W, PROT_WRITE) |
_calc_vm_trans(secinfo.flags, SGX_SECINFO_X, PROT_EXEC);
- /* TCS pages need to be RW in the PTEs, but can be 0 in the EPCM. */
+ /* TCS pages must always RW set for CPU access while the SECINFO
+ * permissions are *always* zero - the CPU ignores the user provided
+ * values and silently overwrites zero permissions.
+ */
if ((secinfo.flags & SGX_SECINFO_PAGE_TYPE_MASK) == SGX_SECINFO_TCS)
prot |= PROT_READ | PROT_WRITE;
--
2.20.1
next prev parent reply other threads:[~2019-08-19 15:25 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-19 15:25 [PATCH 0/5] x86/sgx: Improve permission handing Jarkko Sakkinen
2019-08-19 15:25 ` Jarkko Sakkinen [this message]
2019-08-22 3:43 ` [PATCH 1/5] x86/sgx: Document permission handling better Sean Christopherson
2019-08-22 16:04 ` Jarkko Sakkinen
2019-08-19 15:25 ` [PATCH 2/5] x86/sgx: Use memchr_inv() in sgx_validate_secinfo() Jarkko Sakkinen
2019-08-22 3:47 ` Sean Christopherson
2019-08-22 16:20 ` Jarkko Sakkinen
2019-08-19 15:25 ` [PATCH 3/5] x86/sgx: Make sgx_validate_secinfo() more readable Jarkko Sakkinen
2019-08-22 3:48 ` Sean Christopherson
2019-08-22 16:26 ` Jarkko Sakkinen
2019-08-22 10:39 ` Ayoun, Serge
2019-08-22 16:45 ` Jarkko Sakkinen
2019-08-19 15:25 ` [PATCH 4/5] x86/sgx: Validate TCS permssions in sgx_validate_secinfo() Jarkko Sakkinen
2019-08-21 18:45 ` Jarkko Sakkinen
2019-08-22 11:33 ` Ayoun, Serge
2019-08-22 14:27 ` Sean Christopherson
2019-08-22 16:46 ` Jarkko Sakkinen
2019-08-22 16:59 ` Jarkko Sakkinen
2019-08-22 3:55 ` Sean Christopherson
2019-08-22 16:31 ` Jarkko Sakkinen
2019-08-22 16:34 ` Sean Christopherson
2019-08-23 0:39 ` Jarkko Sakkinen
2019-08-23 0:57 ` Jarkko Sakkinen
2019-08-23 2:05 ` Sean Christopherson
2019-08-23 13:41 ` Jarkko Sakkinen
2019-08-22 16:38 ` Jarkko Sakkinen
2019-08-19 15:25 ` [PATCH 5/5] x86/sgx: Rename vm_prot_bits as max_vm_flags Jarkko Sakkinen
2019-08-22 4:00 ` Sean Christopherson
2019-08-22 16:43 ` 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=20190819152544.7296-2-jarkko.sakkinen@linux.intel.com \
--to=jarkko.sakkinen@linux.intel.com \
--cc=linux-sgx@vger.kernel.org \
--cc=sean.j.christpherson@intel.com \
--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).