Fix the issue further discussed in:
PATCH v2 1/1 Fix the issue further discussed in:
1. https://lore.kernel.org/linux-sgx/[email protected]/
2. https://lore.kernel.org/linux-sgx/[email protected]/
Use the approach suggested by Matthew, and supported by the analysis that I wrote:
https://lore.kernel.org/linux-sgx/[email protected]/
--- arch/x86/kernel/cpu/sgx/encl.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)
arch/x86/kernel/cpu/sgx/encl.c +23 -1
@@ -307,6 +307,7 @@ int sgx_encl_may_map(struct sgx_encl *encl, unsigned long start,unsigned long idx_start =PFN_DOWN (start);unsigned long idx_end =PFN_DOWN (end -1 );struct sgx_encl_page *page; +unsigned long count =0 ;XA_STATE (xas, &encl->page_array, idx_start);
@@ -317,10 +318,31 @@ int sgx_encl_may_map(struct sgx_encl *encl, unsigned long start,if (current->personality &READ_IMPLIES_EXEC )return -EACCES ; -xas_for_each (&xas, page, idx_end) +/* +* No need to hold encl->lock: +* 1. None of the page->* get written. +* 2. page->vm_max_prot_bits is set in sgx_encl_page_alloc(). This +* is before calling xa_insert(). After that it is never modified. +*/ +xas_lock (&xas); +xas_for_each (&xas, page, idx_end) { +if (++count %XA_CHECK_SCHED ) +continue ; + +xas_pause (&xas); +xas_unlock (&xas); + +/* +* Attributes are not protected by the xa_lock, so I'm assuming +* that this is the legit place for the check. +*/ if (!page || (~page->vm_max_prot_bits & vm_prot_bits))return -EACCES ; +cond_resched (); +xas_lock (&xas); + } +return 0 ; }
Signature · 1 line
2.25.1
Quoted 5 lines · Jarkko Sakkinen
arch/x86/kernel/cpu/sgx/encl.c +0
-1@@ -317,10 +318,31 @@ int sgx_encl_may_map(struct sgx_encl *encl, unsigned long start,if (current->personality &READ_IMPLIES_EXEC )return -EACCES ; -xas_for_each (&xas, page, idx_end)
arch/x86/kernel/cpu/sgx/encl.c int sgx_encl_may_map(struct sgx_encl *encl, unsigned long start, · line 330
Quoted 10 lines
arch/x86/kernel/cpu/sgx/encl.c +10
-0+/* +* No need to hold encl->lock: +* 1. None of the page->* get written. +* 2. page->vm_max_prot_bits is set in sgx_encl_page_alloc(). This +* is before calling xa_insert(). After that it is never modified. +*/ +xas_lock (&xas); +xas_for_each (&xas, page, idx_end) { +if (++count %XA_CHECK_SCHED ) +continue ;
This really doesn't do what you think it does.
int ret = 0;
int count = 0;
xas_lock(&xas);
while (xas.index < idx_end) {
struct sgx_page *page = xas_next(&xas);
if (!page || (~page->vm_max_prot_bits & vm_prot_bits)) {
ret = -EACCESS;
break;
}
if (++count % XA_CHECK_SCHED)
continue;
xas_pause(&xas);
xas_unlock(&xas);
cond_resched();
xas_lock(&xas);
}
xas_unlock(&xas);
return ret;Quoted 33 lines · Matthew Wilcox
Quoted 5 lines · Jarkko Sakkinen
arch/x86/kernel/cpu/sgx/encl.c +0
-1@@ -317,10 +318,31 @@ int sgx_encl_may_map(struct sgx_encl *encl, unsigned long start,if (current->personality &READ_IMPLIES_EXEC )return -EACCES ; -xas_for_each (&xas, page, idx_end)arch/x86/kernel/cpu/sgx/encl.c int sgx_encl_may_map(struct sgx_encl *encl, unsigned long start, · line 330
Quoted 10 lines
arch/x86/kernel/cpu/sgx/encl.c +10
-0+/* +* No need to hold encl->lock: +* 1. None of the page->* get written. +* 2. page->vm_max_prot_bits is set in sgx_encl_page_alloc(). This +* is before calling xa_insert(). After that it is never modified. +*/ +xas_lock (&xas); +xas_for_each (&xas, page, idx_end) { +if (++count %XA_CHECK_SCHED ) +continue ;This really doesn't do what you think it does.
int ret = 0; int count = 0; xas_lock(&xas); while (xas.index < idx_end) { struct sgx_page *page = xas_next(&xas); if (!page || (~page->vm_max_prot_bits & vm_prot_bits)) { ret = -EACCESS; break; } if (++count % XA_CHECK_SCHED) continue;
Quoted 8 lines
xas_pause(&xas); xas_unlock(&xas); cond_resched(); xas_lock(&xas); } xas_unlock(&xas); return ret;
No mine certainly does not, it locks up the system if the loop succeeds (i.e. does not return -EACCESS) :-) Unfortunately had by mistake the v1 patch (xa_load()) in the kernel that I used to test.
/Jarkko
Quoted 41 lines · Jarkko Sakkinen
Quoted 40 lines · Matthew Wilcox
Quoted 5 lines · Jarkko Sakkinen
arch/x86/kernel/cpu/sgx/encl.c +0
-1@@ -317,10 +318,31 @@ int sgx_encl_may_map(struct sgx_encl *encl, unsigned long start,if (current->personality &READ_IMPLIES_EXEC )return -EACCES ; -xas_for_each (&xas, page, idx_end)arch/x86/kernel/cpu/sgx/encl.c int sgx_encl_may_map(struct sgx_encl *encl, unsigned long start, · line 330
Quoted 10 lines
arch/x86/kernel/cpu/sgx/encl.c +10
-0+/* +* No need to hold encl->lock: +* 1. None of the page->* get written. +* 2. page->vm_max_prot_bits is set in sgx_encl_page_alloc(). This +* is before calling xa_insert(). After that it is never modified. +*/ +xas_lock (&xas); +xas_for_each (&xas, page, idx_end) { +if (++count %XA_CHECK_SCHED ) +continue ;This really doesn't do what you think it does.
int ret = 0; int count = 0; xas_lock(&xas); while (xas.index < idx_end) { struct sgx_page *page = xas_next(&xas); if (!page || (~page->vm_max_prot_bits & vm_prot_bits)) { ret = -EACCESS; break; } if (++count % XA_CHECK_SCHED) continue; xas_pause(&xas); xas_unlock(&xas); cond_resched(); xas_lock(&xas); } xas_unlock(&xas);
Quoted 5 lines
Quoted 1 line
return ret;No mine certainly does not, it locks up the system if the loop succeeds (i.e. does not return
-EACCESS) :-) Unfortunately had by mistake the v1 patch (xa_load()) in the kernel that I used to test.
... and not having xas_unlock() in the end was not intentional.
/Jarkko