Fix #546, add argument validation

nasa · Feb 18, 2021 · c85ff3b · c85ff3b
1 parent cf25a50
commit c85ff3b
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 47 deletions.
diff --git a/fsw/cfe-core/src/es/cfe_es_api.c b/fsw/cfe-core/src/es/cfe_es_api.c
@@ -1731,66 +1731,54 @@ int32 CFE_ES_RegisterCDS(CFE_ES_CDSHandle_t *CDSHandlePtr, size_t BlockSize, con
     char    AppName[OS_MAX_API_NAME] = {"UNKNOWN"};
     char    CDSName[CFE_MISSION_ES_CDS_MAX_FULL_NAME_LEN] = {""};
 
-    /* Initialize output to safe value, in case this fails */
-    *CDSHandlePtr = CFE_ES_CDS_BAD_HANDLE;
-
     /* Check to make sure calling application is legit */
     Status = CFE_ES_GetAppID(&ThisAppId);
 
-    if ( Status != CFE_SUCCESS || CDSHandlePtr == NULL || Name == NULL)  /* Application ID was invalid */
+    if (CDSHandlePtr == NULL || Name == NULL){
+        CFE_ES_WriteToSysLog("CFE_ES_RegisterCDS:-Failed invalid arguments\n");
+        return CFE_ES_BAD_ARGUMENT;
+    }
+
+    /* Initialize output to safe value, in case this fails */
+    *CDSHandlePtr = CFE_ES_CDS_BAD_HANDLE;
+
+    if ( Status != CFE_SUCCESS )  /* Application ID was invalid */
+    {
+         CFE_ES_WriteToSysLog("CFE_CDS:Register-Bad AppId context\n");
+    }
+    else if (!CFE_ES_Global.CDSIsAvailable)
     {
-      CFE_ES_WriteToSysLog("CFE_ES_RegisterCDS:-Failed invalid arguments\n");
-      Status = CFE_ES_BAD_ARGUMENT;
+        CFE_ES_WriteToSysLog("CFE_CDS:Register-CDS not available\n");
+        Status = CFE_ES_NOT_IMPLEMENTED;
     }
     else
     {
-        /* Initialize output to safe value, in case this fails */
-        *CDSHandlePtr = CFE_ES_RESOURCEID_UNDEFINED;
+        /* Make sure specified CDS name is not too long or too short */
+        NameLen = strlen(Name);
+        if ((NameLen > CFE_MISSION_ES_CDS_MAX_NAME_LENGTH) || (NameLen == 0))
+        {
+           Status = CFE_ES_CDS_INVALID_NAME;
 
-        /* Check to make sure calling application is legit */
-        Status = CFE_ES_GetAppID(&ThisAppId);
+           /* Perform a buffer overrun safe copy of name for debug log message */
 
-        if ( Status != CFE_SUCCESS )  /* Application ID was invalid */
-        {
-            CFE_ES_WriteToSysLog("CFE_CDS:Register-Bad AppId context\n");
-        }
-        else if (!CFE_ES_Global.CDSIsAvailable)
-        {
-            CFE_ES_WriteToSysLog("CFE_CDS:Register-CDS not available\n");
-            Status = CFE_ES_NOT_IMPLEMENTED;
+           strncpy(CDSName, Name, sizeof(CDSName) - 1);
+           CDSName[sizeof(CDSName) - 1] = '\0';
+           CFE_ES_WriteToSysLog("CFE_CDS:Register-CDS Name (%s) is too long\n", CDSName);
         }
         else
         {
-            /* Assume we can't make a CDS and return a bad handle for now */
-            *CDSHandlePtr = CFE_ES_CDS_BAD_HANDLE;
-
-            /* Make sure specified CDS name is not too long or too short */
-            NameLen = strlen(Name);
-            if ((NameLen > CFE_MISSION_ES_CDS_MAX_NAME_LENGTH) || (NameLen == 0))
-            {
-                Status = CFE_ES_CDS_INVALID_NAME;
+           /* Modify specified name to be processor specific name */
+           /* of the form "AppName.Name"                          */
+           CFE_ES_FormCDSName(CDSName, Name, ThisAppId);
 
-                /* Perform a buffer overrun safe copy of name for debug log message */
+           /* Create CDS and designate it as NOT being a Critical Table */
+           Status = CFE_ES_RegisterCDSEx(CDSHandlePtr, BlockSize, CDSName, false);
 
-                strncpy(CDSName, Name, sizeof(CDSName) - 1);
-                CDSName[sizeof(CDSName) - 1] = '\0';
-                CFE_ES_WriteToSysLog("CFE_CDS:Register-CDS Name (%s) is too long\n", CDSName);
-            }
-            else
-            {
-                /* Modify specified name to be processor specific name */
-                /* of the form "AppName.Name"                          */
-                CFE_ES_FormCDSName(CDSName, Name, ThisAppId);
-
-                /* Create CDS and designate it as NOT being a Critical Table */
-                Status = CFE_ES_RegisterCDSEx(CDSHandlePtr, BlockSize, CDSName, false);
-
-                /* If size is unacceptable, log it */
-                if (Status == CFE_ES_CDS_INVALID_SIZE)
-                {
-                    CFE_ES_WriteToSysLog("CFE_CDS:Register-CDS %s has invalid size (%lu)\n", Name, (unsigned long)BlockSize);
-                }
-            }
+           /* If size is unacceptable, log it */
+           if (Status == CFE_ES_CDS_INVALID_SIZE)
+           {
+              CFE_ES_WriteToSysLog("CFE_CDS:Register-CDS %s has invalid size (%lu)\n", Name, (unsigned long)BlockSize);
+           }
         }
     }
 

diff --git a/fsw/cfe-core/src/sb/cfe_sb_api.c b/fsw/cfe-core/src/sb/cfe_sb_api.c
@@ -2081,6 +2081,12 @@ CFE_SB_Buffer_t *CFE_SB_ZeroCopyGetPtr(size_t MsgSize,
    CFE_SB_ZeroCopyD_t  *zcd = NULL;
    CFE_SB_BufferD_t    *bd = NULL;
 
+    if(MsgSize > CFE_MISSION_SB_MAX_SB_MSG_SIZE)
+    {
+        CFE_ES_WriteToSysLog(" CFE_SB:ZeroCopyGetPtr-Failed, MsgSize is too large\n");
+        return NULL;
+    }
+
     CFE_SB_LockSharedData(__func__,__LINE__);
 
     /* Allocate a new zero copy descriptor from the SB memory pool.*/

diff --git a/fsw/cfe-core/src/sb/cfe_sb_util.c b/fsw/cfe-core/src/sb/cfe_sb_util.c
@@ -160,7 +160,13 @@ void CFE_SB_SetUserDataLength(CFE_MSG_Message_t *MsgPtr, size_t DataLength)
         HdrSize = CFE_SB_MsgHdrSize(MsgPtr);
         TotalMsgSize = HdrSize + DataLength;
 
-        CFE_MSG_SetSize(MsgPtr, TotalMsgSize);
+        if(TotalMsgSize <= CFE_MISSION_SB_MAX_SB_MSG_SIZE){
+            CFE_MSG_SetSize(MsgPtr, TotalMsgSize);
+        }
+        else
+        {
+            CFE_ES_WriteToSysLog("CFE_SB:SetUserDataLength-Failed TotalMsgSize too large\n");  
+        }   
     }
 }/* end CFE_SB_SetUserDataLength */