Browse Source

Add error code in oal for invalid inputs

Signed-off-by: Haitao Huang <4699115+haitaohuang@users.noreply.github.com>
Haitao Huang 6 years ago
parent
commit
960ad91a4a

+ 1 - 0
common/inc/internal/oal/uae_oal_api.h

@@ -42,6 +42,7 @@ typedef enum{
     UAE_OAL_ERROR_UNEXPECTED            ,
     UAE_OAL_ERROR_AESM_UNAVAILABLE      ,
     UAE_OAL_ERROR_TIMEOUT               ,
+    UAE_OAL_ERROR_INVALID               ,
 } uae_oal_status_t;
 
 /*OAL methods from here forward */

+ 1 - 1
psw/ae/common/src/SocketTransporter.cpp

@@ -82,7 +82,7 @@ uae_oal_status_t SocketTransporter::sendMessage(AEMessage *message, ICommunicati
 uae_oal_status_t SocketTransporter::transact(IAERequest* request, IAEResponse* response, uint32_t timeout)
 {
     if (request == NULL || response == NULL)
-        return UAE_OAL_ERROR_UNEXPECTED;
+        return UAE_OAL_ERROR_INVALID;
 
 
     ICommunicationSocket* communicationSocket = mSocketFactory->NewCommunicationSocket();

+ 3 - 0
psw/uae_service/sgx_uae_service.cpp

@@ -623,6 +623,9 @@ sgx_status_t    oal_map_status(uae_oal_status_t status)
         case UAE_OAL_ERROR_TIMEOUT:
             retVal = SGX_ERROR_SERVICE_TIMEOUT;
             break;
+        case UAE_OAL_ERROR_INVALID:
+            retVal = SGX_ERROR_INVALID_PARAMETER;
+            break;
         default:
             retVal = SGX_ERROR_UNEXPECTED;
     }

+ 1 - 1
psw/uae_service/uae_wrapper/src/AEServicesImpl.cpp

@@ -54,7 +54,7 @@ uae_oal_status_t AEServicesImpl::InternalInterface(IAERequest* request, IAERespo
 {
     if(request->check() == false)
     {
-        return UAE_OAL_ERROR_UNEXPECTED;
+        return UAE_OAL_ERROR_INVALID;
     }
     uae_oal_status_t ipc_status = mTransporter->transact(request, response, timeout_msec);