Merge pull request #571 from lzha101/fix_large_rsrv_mem

Fix bug of setting large reserved momory.

Signed-off-by: Zhang Lili Z lili.z.zhang@intel.com

Author: lzha101

psw/urts/loader.cpp

@@ -861,7 +861,7 @@ int CLoader::set_memory_protection()
         {
             if (layout->entry.id ==  LAYOUT_ID_RSRV_MIN && layout->entry.si_flags == SI_FLAGS_RWX && layout->entry.page_count > 0)
             {
-                ret = get_enclave_creator()->emodpr((uint64_t)m_start_addr + layout->entry.rva, layout->entry.page_count << SE_PAGE_SHIFT, (uint64_t)(SI_FLAG_R |SI_FLAG_W ));
+                ret = get_enclave_creator()->emodpr((uint64_t)m_start_addr + layout->entry.rva, (uint64_t)layout->entry.page_count << SE_PAGE_SHIFT, (uint64_t)(SI_FLAG_R |SI_FLAG_W ));
                 if (ret != SGX_SUCCESS)
                     return SGX_ERROR_UNEXPECTED;
                 break;

sdk/trts/linux/elf_parser.c

@@ -540,7 +540,7 @@ sgx_status_t change_protection(void *enclave_base)
         if (g_global_data.layout_table[i].entry.id == LAYOUT_ID_RSRV_MIN && g_global_data.layout_table[i].entry.si_flags ==  SI_FLAGS_RWX && g_global_data.layout_table[i].entry.page_count > 0)
         {
             if((status = trts_mprotect((size_t)((size_t)enclave_base + g_global_data.layout_table[i].entry.rva), 
-                                                                     g_global_data.layout_table[i].entry.page_count << SE_PAGE_SHIFT, 
+                                                                     (size_t)g_global_data.layout_table[i].entry.page_count << SE_PAGE_SHIFT, 
                                                                            SI_FLAG_R|SI_FLAG_W)) != SGX_SUCCESS)
                 return status;
             break;