Add security checks in ualloc()

Check that the memory allocated is page-aligned, and that the end of the returned memory is not inside the enclave.
enarx · Mar 31, 2020 · 81949c2 · 81949c2
1 parent 807c640
commit 81949c2
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/enarx-keep-sgx-shim/src/handler.rs b/enarx-keep-sgx-shim/src/handler.rs
@@ -93,7 +93,9 @@ impl<'a> Handler<'a> {
             )
         };
 
-        if self.enclave.contains(&ret) {
+        // Make sure the allocated memory is page-aligned and outside of the enclave.
+        if self.enclave.contains(&ret) || self.enclave.contains(&(ret + bytes)) || ret & 0xfff != 0
+        {
             self.attacked();
         }