ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-01 02:36:44 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Set misc_attr for failing _create_enclave flows

Browse Source 
Set misc_attr in the top level sgx_create_enclave if _create_enclave
fails.  This provides the user with the platform's capabilities when
sgx_create_enclave fails for any reason other than a parameter error.

Previously the misc_attr was only set upon failure if build_image
failed, which was not helpful when sgx_create_enclave failed due to
an attribute error, e.g. misc_select, as the flow aborted before it
reached build_image.

Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
This commit is contained in:
Sean Christopherson 2016-09-20 10:35:02 -07:00
parent 85947caa12
commit ed437b5ea1
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
psw/urts/linux/urts.cpp
View File

@ -58,6 +58,14 @@ extern "C" sgx_status_t sgx_create_enclave(const char *file_name, const int debu
file.name_len = (uint32_t)strlen(resolved_path);
ret = _create_enclave(!!debug, fd, file, NULL, launch_token, launch_token_updated, enclave_id, misc_attr);
if(SGX_SUCCESS != ret && misc_attr)
{
sgx_misc_attribute_t plat_cap;
memset(&plat_cap, 0, sizeof(plat_cap));
get_enclave_creator()->get_plat_cap(&plat_cap);
memcpy_s(misc_attr, sizeof(sgx_misc_attribute_t), &plat_cap, sizeof(sgx_misc_attribute_t));
}
close(fd);
return ret;

12
psw/urts/loader.cpp
View File

@ -641,7 +641,7 @@ int CLoader::load_enclave(SGXLaunchToken *lc, int debug, const metadata_t *metad
}
ret = build_image(lc, &sgx_misc_attr.secs_attr, prd_css_file, &sgx_misc_attr);
//return platform capability if fail. Otherwise, return secs.attr.
//Update misc_attr with secs.attr upon success.
if(SGX_SUCCESS == ret)
{
if(misc_attr)
@ -651,16 +651,6 @@ int CLoader::load_enclave(SGXLaunchToken *lc, int debug, const metadata_t *metad
misc_attr->secs_attr.flags |= SGX_FLAGS_INITTED;
}
}
else
{
if(misc_attr)
{
sgx_misc_attribute_t plat_cap;
memset(&plat_cap, 0, sizeof(plat_cap));
get_enclave_creator()->get_plat_cap(&plat_cap);
memcpy_s(misc_attr, sizeof(sgx_misc_attribute_t), &plat_cap, sizeof(sgx_misc_attribute_t));
}
}
return ret;
}