On Thu, Oct 10, 2019 at 02:37:45PM +0300, Jarkko Sakkinen wrote: > tag v23-rc2 > Tagger: Jarkko Sakkinen <jarkko.sakkinen@xxxxxxxxxxxxxxx> > Date: Thu Oct 10 14:33:07 2019 +0300 > > x86/sgx: v23-rc1 patch set > > * Return -EIO instead of -ECANCELED when ptrace() fails to read a TCS page. > * In the reclaimer, pin page before ENCLS[EBLOCK] because pinning can fail > (because of OOM) even in legit behaviour and after EBLOCK the reclaiming > flow can be only reverted by killing the whole enclave. > * Fixed SGX_ATTR_RESERVED_MASK. Bit 7 was marked as reserved while in fact > it should have been bit 6 (Table 37-3 in the SDM). > * Return -EPERM from SGX_IOC_ENCLAVE_INIT when ENCLS[EINIT] returns an SGX > error code. > * In v22 __uaccess_begin() was used to pin the source page in > __sgx_encl_add_page(). Switch to get_user_pages() in order to avoid > deadlock (mmap_sem might get locked twice in the same thread). __uaccess_begin() is also needed to performan access checks the legit user space address. What we can do is to use get_user_pages() just to make sure that the page is faulted while we perform ENCLS[EADD]. I updated the master branch with the fix for this. Now the access pattern is: ret = get_user_pages(src, 1, 0, &src_page, NULL); if (ret < 1) return ret; __uaccess_begin(); 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 = (unsigned long)src; ret = __eadd(&pginfo, sgx_epc_addr(epc_page)); __uaccess_end(); put_page(src_page); /Jarkko
