Fix assert for SGX=1 and DEBUG=1 (Issue #97) (#98)

* Try adding CI commands that will catch issues like #97.   This should cause a CI failure.  Fix to follow.

* Define __abort for the urts.

* Fix issue #97, part 2
This commit is contained in:
Don Porter
2018-08-13 10:19:52 -04:00
parent fe7a6e6934
commit dc40c5f809
4 changed files with 11 additions and 7 deletions
+4 -1
View File
@@ -8,13 +8,16 @@ before_script:
- git clone https://github.com/01org/linux-sgx-driver.git -b sgx_driver_$ISGX_DRIVER_VERSION
script:
- make
- make
- cd $TRAVIS_BUILD_DIR/Pal/src && make clean && make SGX=1
- cd $TRAVIS_BUILD_DIR/Pal/src && make clean && make DEBUG=1
- cd $TRAVIS_BUILD_DIR/Pal/src && make clean && make SGX=1 DEBUG=1
- cd $TRAVIS_BUILD_DIR/Pal/src/host/Linux-SGX/sgx-driver && make
- cd $TRAVIS_BUILD_DIR/Pal/regression && make regression
- cd $TRAVIS_BUILD_DIR/LibOS/shim/test/regression && make regression
- cd $TRAVIS_BUILD_DIR/LibOS/shim/test/apps/ltp && make regression
matrix:
include:
- os: linux
+3 -3
View File
@@ -25,9 +25,9 @@
static
long int __host_ptrace (enum __ptrace_request request, va_list * ap)
{
pid_t pid = va_arg(ap, pid_t);
void * addr = va_arg(ap, void *);
void * data = va_arg(ap, void *);
pid_t pid = va_arg(*ap, pid_t);
void * addr = va_arg(*ap, void *);
void * data = va_arg(*ap, void *);
long int res, ret;
if (request > 0 && request < 4)
+4
View File
@@ -709,3 +709,7 @@ int ecall_thread_start (void)
EDEBUG(ECALL_THREAD_START, NULL);
return sgx_ecall(ECALL_THREAD_START, NULL);
}
void __abort(void) {
INLINE_SYSCALL(exit_group, 1, -1);
}
-3
View File
@@ -4,9 +4,6 @@
#include "pal_linux.h"
#include "pal_security.h"
#define assert(cond) \
do { if (!(cond)) INLINE_SYSCALL(exit_group, 1, 0); } while (0);
int ecall_enclave_start (const char ** arguments, const char ** environments);
int ecall_thread_start (void);