diff --git a/deps/rust-sgx-sdk b/deps/rust-sgx-sdk index 77c1d48c..e2a9b663 160000 --- a/deps/rust-sgx-sdk +++ b/deps/rust-sgx-sdk @@ -1 +1 @@ -Subproject commit 77c1d48ca310b1029b672dfc8903666292288632 +Subproject commit e2a9b663cdd942659d4c16f8dadda94b1d6fcc6e diff --git a/src/exec/rust-toolchain b/src/exec/rust-toolchain index 8c975dc6..148ed93d 100644 --- a/src/exec/rust-toolchain +++ b/src/exec/rust-toolchain @@ -1 +1 @@ -nightly-2020-09-08 +nightly-2020-10-25 diff --git a/src/libos/Cargo.lock b/src/libos/Cargo.lock index 1a862f7a..94e865a3 100644 --- a/src/libos/Cargo.lock +++ b/src/libos/Cargo.lock @@ -533,11 +533,11 @@ dependencies = [ [[package]] name = "sgx_alloc" -version = "1.1.2" +version = "1.1.3" [[package]] name = "sgx_backtrace_sys" -version = "1.1.2" +version = "1.1.3" dependencies = [ "cc", "sgx_build_helper", @@ -550,7 +550,7 @@ version = "0.1.3" [[package]] name = "sgx_cov" -version = "1.1.2" +version = "1.1.3" dependencies = [ "lazy_static", "profiler_builtins", @@ -562,18 +562,18 @@ dependencies = [ [[package]] name = "sgx_demangle" -version = "1.1.2" +version = "1.1.3" [[package]] name = "sgx_libc" -version = "1.1.2" +version = "1.1.3" dependencies = [ "sgx_types", ] [[package]] name = "sgx_rand" -version = "1.1.2" +version = "1.1.3" dependencies = [ "sgx_trts", "sgx_tstd", @@ -582,14 +582,14 @@ dependencies = [ [[package]] name = "sgx_tcrypto" -version = "1.1.2" +version = "1.1.3" dependencies = [ "sgx_types", ] [[package]] name = "sgx_tprotected_fs" -version = "1.1.2" +version = "1.1.3" dependencies = [ "sgx_trts", "sgx_types", @@ -597,7 +597,7 @@ dependencies = [ [[package]] name = "sgx_trts" -version = "1.1.2" +version = "1.1.3" dependencies = [ "sgx_libc", "sgx_types", @@ -605,14 +605,14 @@ dependencies = [ [[package]] name = "sgx_tse" -version = "1.1.2" +version = "1.1.3" dependencies = [ "sgx_types", ] [[package]] name = "sgx_tstd" -version = "1.1.2" +version = "1.1.3" dependencies = [ "hashbrown_tstd", "sgx_alloc", @@ -627,7 +627,7 @@ dependencies = [ [[package]] name = "sgx_types" -version = "1.1.2" +version = "1.1.3" [[package]] name = "sgx_unwind" diff --git a/src/libos/rust-toolchain b/src/libos/rust-toolchain index 8c975dc6..148ed93d 100644 --- a/src/libos/rust-toolchain +++ b/src/libos/rust-toolchain @@ -1 +1 @@ -nightly-2020-09-08 +nightly-2020-10-25 diff --git a/src/libos/src/error/to_errno.rs b/src/libos/src/error/to_errno.rs index d205f04e..67c8e996 100644 --- a/src/libos/src/error/to_errno.rs +++ b/src/libos/src/error/to_errno.rs @@ -101,7 +101,7 @@ impl ToErrno for rcore_fs::vfs::FsError { } } -impl ToErrno for std::alloc::AllocErr { +impl ToErrno for std::alloc::AllocError { fn errno(&self) -> Errno { ENOMEM } diff --git a/src/libos/src/untrusted/alloc.rs b/src/libos/src/untrusted/alloc.rs index 80ef9f92..ec56a659 100644 --- a/src/libos/src/untrusted/alloc.rs +++ b/src/libos/src/untrusted/alloc.rs @@ -1,5 +1,5 @@ use super::*; -use std::alloc::{AllocErr, AllocRef, Layout}; +use std::alloc::{AllocError, AllocRef, Layout}; use std::ptr::{self, write_bytes, NonNull}; /// The global memory allocator for untrusted memory @@ -8,9 +8,9 @@ pub static mut UNTRUSTED_ALLOC: UntrustedAlloc = UntrustedAlloc; pub struct UntrustedAlloc; unsafe impl AllocRef for UntrustedAlloc { - fn alloc(&mut self, layout: Layout) -> std::result::Result, AllocErr> { + fn alloc(&self, layout: Layout) -> std::result::Result, AllocError> { if layout.size() == 0 { - return Err(AllocErr); + return Err(AllocError); } // Do OCall to allocate the untrusted memory according to the given layout @@ -26,7 +26,7 @@ unsafe impl AllocRef for UntrustedAlloc { mem_ptr } as *mut u8; if mem_ptr == std::ptr::null_mut() { - return Err(AllocErr); + return Err(AllocError); } // Sanity checks @@ -43,7 +43,7 @@ unsafe impl AllocRef for UntrustedAlloc { .unwrap()) } - unsafe fn dealloc(&mut self, ptr: NonNull, layout: Layout) { + unsafe fn dealloc(&self, ptr: NonNull, layout: Layout) { // Pre-condition: out-of-enclave debug_assert!(sgx_trts::trts::rsgx_raw_is_outside_enclave( ptr.as_ptr(), diff --git a/src/libos/src/untrusted/slice_alloc.rs b/src/libos/src/untrusted/slice_alloc.rs index 189b04d5..5a309925 100644 --- a/src/libos/src/untrusted/slice_alloc.rs +++ b/src/libos/src/untrusted/slice_alloc.rs @@ -1,5 +1,5 @@ use super::*; -use std::alloc::{AllocErr, AllocRef, Layout}; +use std::alloc::{AllocError, AllocRef, Layout}; use std::ptr::NonNull; use std::sync::atomic::{AtomicUsize, Ordering}; diff --git a/tools/docker/Dockerfile.aliyunlinux b/tools/docker/Dockerfile.aliyunlinux index cf51eccd..35e5a4b9 100644 --- a/tools/docker/Dockerfile.aliyunlinux +++ b/tools/docker/Dockerfile.aliyunlinux @@ -156,7 +156,7 @@ ENV PATH="/opt/occlum/toolchains/jvm/bin:$PATH" # Install Rust ENV PATH="/root/.cargo/bin:$PATH" -ENV OCCLUM_RUST_VERSION=nightly-2020-09-08 +ENV OCCLUM_RUST_VERSION=nightly-2020-10-25 RUN curl https://sh.rustup.rs -sSf | \ sh -s -- --default-toolchain ${OCCLUM_RUST_VERSION} -y && \ rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \ diff --git a/tools/docker/Dockerfile.centos8.2 b/tools/docker/Dockerfile.centos8.2 index 680f3d09..b0543f4a 100644 --- a/tools/docker/Dockerfile.centos8.2 +++ b/tools/docker/Dockerfile.centos8.2 @@ -55,7 +55,7 @@ RUN wget http://www.etallen.com/cpuid/cpuid-20200211.x86_64.tar.gz && \ # Install Rust ENV PATH="/root/.cargo/bin:$PATH" -ENV OCCLUM_RUST_VERSION=nightly-2020-09-08 +ENV OCCLUM_RUST_VERSION=nightly-2020-10-25 RUN curl https://sh.rustup.rs -sSf | \ sh -s -- --default-toolchain ${OCCLUM_RUST_VERSION} -y && \ rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \ diff --git a/tools/docker/Dockerfile.ubuntu18.04 b/tools/docker/Dockerfile.ubuntu18.04 index 1c3bafee..be5e5e4f 100644 --- a/tools/docker/Dockerfile.ubuntu18.04 +++ b/tools/docker/Dockerfile.ubuntu18.04 @@ -72,7 +72,7 @@ RUN wget http://www.etallen.com/cpuid/cpuid-20200211.x86_64.tar.gz && \ # Install Rust ENV PATH="/root/.cargo/bin:$PATH" -ENV OCCLUM_RUST_VERSION=nightly-2020-09-08 +ENV OCCLUM_RUST_VERSION=nightly-2020-10-25 RUN curl https://sh.rustup.rs -sSf | \ sh -s -- --default-toolchain ${OCCLUM_RUST_VERSION} -y && \ rm -rf /root/.cargo/registry && rm -rf /root/.cargo/git && \