RDK-60307 [RRD] RDK Coverity Defect Resolution for Device Management

mtirum011 · mtirum011 · commit c35d07fd9755 · 2026-02-03T14:49:21.000Z
diff --git a/src/rrdEventProcess.c b/src/rrdEventProcess.c
@@ -173,22 +173,26 @@ static void processIssueType(data_buf *rbuf)
                         size_t dynamicstrlen = strlen(dynamicprofiledata->command);
                         if (staticstrlen > 0 && staticprofiledata->command[staticstrlen - 1] == '"') {
                             staticprofiledata->command[staticstrlen - 1] = '\0';
+                            staticstrlen--; // Update length after removing trailing quote
                         }
                         if (dynamicprofiledata->command[0] == '"') {
                             dynamicprofiledata->command[0] = COMMAND_DELIM;
                         }
                         RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Static Profile Commands: %s, Dynamic Profile Commands: %s\n", __FUNCTION__, __LINE__, staticprofiledata->command, dynamicprofiledata->command);
 
-                        size_t appendstrlen = ((staticstrlen - 1) + dynamicstrlen + 1);
+                        size_t appendstrlen = (staticstrlen + dynamicstrlen + 1);
                         char *appendcommandstr = (char *)realloc(staticprofiledata->command, appendstrlen);
                         if (appendcommandstr == NULL) {
-                            RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Memory Allocation Failed... \n", __FUNCTION__, __LINE__);
+                            RDK_LOG(RDK_LOG_ERROR, LOG_REMDEBUG, "[%s:%d]: Memory Allocation Failed... \n", __FUNCTION__, __LINE__);
                         }
-                        strcat(appendcommandstr, dynamicprofiledata->command);
-                        staticprofiledata->command = appendcommandstr;
-                        RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Updated command after append from dynamic and static profile: %s \n", __FUNCTION__, __LINE__, staticprofiledata->command);
-                        RDK_LOG(RDK_LOG_DEBUG,LOG_REMDEBUG,"[%s:%d]: Executing Commands in Runtime Service... \n",__FUNCTION__,__LINE__);
-                        checkIssueNodeInfo(pIssueNode, NULL, rbuf, false, staticprofiledata); 
+                        else
+                        {
+                            strcat(appendcommandstr, dynamicprofiledata->command);
+                            staticprofiledata->command = appendcommandstr;
+                            RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Updated command after append from dynamic and static profile: %s \n", __FUNCTION__, __LINE__, staticprofiledata->command);
+                            RDK_LOG(RDK_LOG_DEBUG,LOG_REMDEBUG,"[%s:%d]: Executing Commands in Runtime Service... \n",__FUNCTION__,__LINE__);
+                            checkIssueNodeInfo(pIssueNode, NULL, rbuf, false, staticprofiledata);
+                        } 
                     }
                 }
 	    }	    
diff --git a/src/rrdJsonParser.c b/src/rrdJsonParser.c
@@ -96,7 +96,22 @@ char * readJsonFile(char *jsonfile)
     }
     fseek(fp, 0, SEEK_SET);
     jsonfile_content = (char *) malloc(sizeof(char) * (ch_count + 1));
-    fread(jsonfile_content, 1, ch_count,fp);
+    if (jsonfile_content == NULL)
+    {
+        RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Memory allocation failed for json file %s \n",__FUNCTION__,__LINE__,jsonfile);
+        fclose(fp);
+        return NULL;
+    }
+    
+    size_t bytes_read = fread(jsonfile_content, 1, ch_count, fp);
+    if (bytes_read != (size_t)ch_count)
+    {
+        RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Failed to read json file %s. Expected %d bytes, read %zu bytes \n",__FUNCTION__,__LINE__,jsonfile,ch_count,bytes_read);
+        free(jsonfile_content);
+        fclose(fp);
+        return NULL;
+    }
+    
     jsonfile_content[ch_count] ='\0';
     fclose(fp);
 
@@ -486,6 +501,14 @@ void checkIssueNodeInfo(issueNodeData *issuestructNode, cJSON *jsoncfg, data_buf
     struct tm *ltime;
     rfcbuf = strdup(buff->mdata);
 
+    if (rfcbuf == NULL)
+    {
+        RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Memory allocation failed for rfcbuf\n",__FUNCTION__,__LINE__);
+        free(buff->mdata); // free rfc data
+        free(buff->jsonPath); // free rrd path info
+        return;
+    }
+
     // Creating Directory for MainNode under /tmp/rrd Folder
     ctime = time (NULL);
     ltime = localtime (&ctime);
@@ -500,6 +523,7 @@ void checkIssueNodeInfo(issueNodeData *issuestructNode, cJSON *jsoncfg, data_buf
     if (mkdir(outdir,0777) != 0)
     {
         RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: %s Directory creation failed!!!\n",__FUNCTION__,__LINE__,outdir);
+        free(rfcbuf); // free duplicated rfc data
         free(buff->mdata); // free rfc data
         free(buff->jsonPath); // free rrd path info
         return;
@@ -552,12 +576,22 @@ void checkIssueNodeInfo(issueNodeData *issuestructNode, cJSON *jsoncfg, data_buf
                     RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: RRD Upload Script Execution Success...\n",__FUNCTION__,__LINE__);
                 }
             }
+            if (rfcbuf != NULL)
+            {
+                free(rfcbuf); // free duplicated rfc data
+            }
             free(buff->mdata); // free rfc data
             free(buff->jsonPath); // free rrd path info
 	}
 	else
 	{
             RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: No Command excuted as RRD Failed to change directory:%s\n",__FUNCTION__,__LINE__,outdir);
+            if (rfcbuf != NULL)
+            {
+                free(rfcbuf); // free duplicated rfc data
+            }
+            free(buff->mdata); // free rfc data
+            free(buff->jsonPath); // free rrd path info
 	}
     }
 }
@@ -634,7 +668,7 @@ bool processAllDebugCommand(cJSON *jsoncfg, issueNodeData *issuestructNode, char
 	         }
 	    }
         }
-        free(rfcbuf); // free rfc value
+        // Note: rfcbuf is owned by caller and will be freed there
     }
     else
     {
diff --git a/src/rrdRunCmdThread.c b/src/rrdRunCmdThread.c
@@ -40,7 +40,9 @@ static cacheData *cacheDataNode = NULL;
 void initCache(void)
 {
     pthread_mutex_init(&rrdCacheMut, NULL);
+    pthread_mutex_lock(&rrdCacheMut);
     cacheDataNode = NULL;
+    pthread_mutex_unlock(&rrdCacheMut);
 }
 
 /*
@@ -375,8 +377,9 @@ bool executeCommands(issueData *cmdinfo)
             /*Executing Commands using systemd-run*/
             RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: Executing following commands using systemd-run:\n \"%s\"\n",__FUNCTION__,__LINE__,cmdData->command);
 
-            strncpy(remoteDebuggerServiceStr, remoteDebuggerPrefix, strlen(remoteDebuggerPrefix) + 1);
-	    strncat(remoteDebuggerServiceStr, cmdData->rfcvalue, strlen(cmdData->rfcvalue));
+            strncpy(remoteDebuggerServiceStr, remoteDebuggerPrefix, sizeof(remoteDebuggerServiceStr) - 1);
+            remoteDebuggerServiceStr[sizeof(remoteDebuggerServiceStr) - 1] = '\0';
+	    strncat(remoteDebuggerServiceStr, cmdData->rfcvalue, sizeof(remoteDebuggerServiceStr) - strlen(remoteDebuggerServiceStr) - 1);
 
 	    removeQuotes(cmdData->command);
 	    
@@ -389,8 +392,8 @@ bool executeCommands(issueData *cmdinfo)
             {
                 RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: Starting remote_debugger_%s service success...\n",__FUNCTION__,__LINE__,cmdData->rfcvalue);
 		copyDebugLogDestFile(systemdfp, filePointer);
+                v_secure_pclose(systemdfp);
             }
-            v_secure_pclose(systemdfp);
 
             /*Logging output using journalctl to Output file*/
             RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: Using journalctl to log command output...\n",__FUNCTION__,__LINE__);
@@ -403,9 +406,8 @@ bool executeCommands(issueData *cmdinfo)
             {
                 RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: journalctl remote_debugger_%s service success...\n",__FUNCTION__,__LINE__,cmdData->rfcvalue);
 		copyDebugLogDestFile(journalctlfp, filePointer);
+                v_secure_pclose(journalctlfp);
             }
-            
-	    v_secure_pclose(journalctlfp);
 
 	    /* Close debug_output.txt file*/
 	    fclose(filePointer);

Original file line number	Diff line number	Diff line change
`@@ -173,22 +173,26 @@ static void processIssueType(data_buf *rbuf)`
`173`	`173`	`size_t dynamicstrlen = strlen(dynamicprofiledata->command);`
`174`	`174`	`if (staticstrlen > 0 && staticprofiledata->command[staticstrlen - 1] == '"') {`
`175`	`175`	`staticprofiledata->command[staticstrlen - 1] = '\0';`
	`176`	`+ staticstrlen--; // Update length after removing trailing quote`
`176`	`177`	`}`
`177`	`178`	`if (dynamicprofiledata->command[0] == '"') {`
`178`	`179`	`dynamicprofiledata->command[0] = COMMAND_DELIM;`
`179`	`180`	`}`
`180`	`181`	`RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Static Profile Commands: %s, Dynamic Profile Commands: %s\n", __FUNCTION__, __LINE__, staticprofiledata->command, dynamicprofiledata->command);`
`181`	`182`
`182`		`- size_t appendstrlen = ((staticstrlen - 1) + dynamicstrlen + 1);`
	`183`	`+ size_t appendstrlen = (staticstrlen + dynamicstrlen + 1);`
`183`	`184`	`char appendcommandstr = (char )realloc(staticprofiledata->command, appendstrlen);`
`184`	`185`	`if (appendcommandstr == NULL) {`
`185`		`- RDK_LOG(RDK_LOG_DEBUG, LOG_REMDEBUG, "[%s:%d]: Memory Allocation Failed... \n", __FUNCTION__, __LINE__);`
	`186`	`+ RDK_LOG(RDK_LOG_ERROR, LOG_REMDEBUG, "[%s:%d]: Memory Allocation Failed... \n", __FUNCTION__, __LINE__);`
`186`	`187`	`}`
`187`		`- strcat(appendcommandstr, dynamicprofiledata->command);`
`188`		`- staticprofiledata->command = appendcommandstr;`
`189`		`- RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Updated command after append from dynamic and static profile: %s \n", __FUNCTION__, __LINE__, staticprofiledata->command);`
`190`		`- RDK_LOG(RDK_LOG_DEBUG,LOG_REMDEBUG,"[%s:%d]: Executing Commands in Runtime Service... \n",__FUNCTION__,__LINE__);`
`191`		`- checkIssueNodeInfo(pIssueNode, NULL, rbuf, false, staticprofiledata);`
	`188`	`+ else`
	`189`	`+ {`
	`190`	`+ strcat(appendcommandstr, dynamicprofiledata->command);`
	`191`	`+ staticprofiledata->command = appendcommandstr;`
	`192`	`+ RDK_LOG(RDK_LOG_INFO, LOG_REMDEBUG, "[%s:%d]: Updated command after append from dynamic and static profile: %s \n", __FUNCTION__, __LINE__, staticprofiledata->command);`
	`193`	`+ RDK_LOG(RDK_LOG_DEBUG,LOG_REMDEBUG,"[%s:%d]: Executing Commands in Runtime Service... \n",__FUNCTION__,__LINE__);`
	`194`	`+ checkIssueNodeInfo(pIssueNode, NULL, rbuf, false, staticprofiledata);`
	`195`	`+ }`
`192`	`196`	`}`
`193`	`197`	`}`
`194`	`198`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,22 @@ char * readJsonFile(char *jsonfile)`
`96`	`96`	`}`
`97`	`97`	`fseek(fp, 0, SEEK_SET);`
`98`	`98`	`jsonfile_content = (char ) malloc(sizeof(char) (ch_count + 1));`
`99`		`- fread(jsonfile_content, 1, ch_count,fp);`
	`99`	`+ if (jsonfile_content == NULL)`
	`100`	`+ {`
	`101`	`+ RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Memory allocation failed for json file %s \n",__FUNCTION__,__LINE__,jsonfile);`
	`102`	`+ fclose(fp);`
	`103`	`+ return NULL;`
	`104`	`+ }`
	`105`	`+`
	`106`	`+ size_t bytes_read = fread(jsonfile_content, 1, ch_count, fp);`
	`107`	`+ if (bytes_read != (size_t)ch_count)`
	`108`	`+ {`
	`109`	`+ RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Failed to read json file %s. Expected %d bytes, read %zu bytes \n",__FUNCTION__,__LINE__,jsonfile,ch_count,bytes_read);`
	`110`	`+ free(jsonfile_content);`
	`111`	`+ fclose(fp);`
	`112`	`+ return NULL;`
	`113`	`+ }`
	`114`	`+`
`100`	`115`	`jsonfile_content[ch_count] ='\0';`
`101`	`116`	`fclose(fp);`
`102`	`117`
`@@ -486,6 +501,14 @@ void checkIssueNodeInfo(issueNodeData issuestructNode, cJSON jsoncfg, data_buf`
`486`	`501`	`struct tm *ltime;`
`487`	`502`	`rfcbuf = strdup(buff->mdata);`
`488`	`503`
	`504`	`+ if (rfcbuf == NULL)`
	`505`	`+ {`
	`506`	`+ RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: Memory allocation failed for rfcbuf\n",__FUNCTION__,__LINE__);`
	`507`	`+ free(buff->mdata); // free rfc data`
	`508`	`+ free(buff->jsonPath); // free rrd path info`
	`509`	`+ return;`
	`510`	`+ }`
	`511`	`+`
`489`	`512`	`// Creating Directory for MainNode under /tmp/rrd Folder`
`490`	`513`	`ctime = time (NULL);`
`491`	`514`	`ltime = localtime (&ctime);`
`@@ -500,6 +523,7 @@ void checkIssueNodeInfo(issueNodeData issuestructNode, cJSON jsoncfg, data_buf`
`500`	`523`	`if (mkdir(outdir,0777) != 0)`
`501`	`524`	`{`
`502`	`525`	`RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: %s Directory creation failed!!!\n",__FUNCTION__,__LINE__,outdir);`
	`526`	`+ free(rfcbuf); // free duplicated rfc data`
`503`	`527`	`free(buff->mdata); // free rfc data`
`504`	`528`	`free(buff->jsonPath); // free rrd path info`
`505`	`529`	`return;`
`@@ -552,12 +576,22 @@ void checkIssueNodeInfo(issueNodeData issuestructNode, cJSON jsoncfg, data_buf`
`552`	`576`	`RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: RRD Upload Script Execution Success...\n",__FUNCTION__,__LINE__);`
`553`	`577`	`}`
`554`	`578`	`}`
	`579`	`+ if (rfcbuf != NULL)`
	`580`	`+ {`
	`581`	`+ free(rfcbuf); // free duplicated rfc data`
	`582`	`+ }`
`555`	`583`	`free(buff->mdata); // free rfc data`
`556`	`584`	`free(buff->jsonPath); // free rrd path info`
`557`	`585`	`}`
`558`	`586`	`else`
`559`	`587`	`{`
`560`	`588`	`RDK_LOG(RDK_LOG_ERROR,LOG_REMDEBUG,"[%s:%d]: No Command excuted as RRD Failed to change directory:%s\n",__FUNCTION__,__LINE__,outdir);`
	`589`	`+ if (rfcbuf != NULL)`
	`590`	`+ {`
	`591`	`+ free(rfcbuf); // free duplicated rfc data`
	`592`	`+ }`
	`593`	`+ free(buff->mdata); // free rfc data`
	`594`	`+ free(buff->jsonPath); // free rrd path info`
`561`	`595`	`}`
`562`	`596`	`}`
`563`	`597`	`}`
`@@ -634,7 +668,7 @@ bool processAllDebugCommand(cJSON jsoncfg, issueNodeData issuestructNode, char`
`634`	`668`	`}`
`635`	`669`	`}`
`636`	`670`	`}`
`637`		`- free(rfcbuf); // free rfc value`
	`671`	`+ // Note: rfcbuf is owned by caller and will be freed there`
`638`	`672`	`}`
`639`	`673`	`else`
`640`	`674`	`{`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,9 @@ static cacheData *cacheDataNode = NULL;`
`40`	`40`	`void initCache(void)`
`41`	`41`	`{`
`42`	`42`	`pthread_mutex_init(&rrdCacheMut, NULL);`
	`43`	`+ pthread_mutex_lock(&rrdCacheMut);`
`43`	`44`	`cacheDataNode = NULL;`
	`45`	`+ pthread_mutex_unlock(&rrdCacheMut);`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`/*`
`@@ -375,8 +377,9 @@ bool executeCommands(issueData *cmdinfo)`
`375`	`377`	`/Executing Commands using systemd-run/`
`376`	`378`	`RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: Executing following commands using systemd-run:\n \"%s\"\n",__FUNCTION__,__LINE__,cmdData->command);`
`377`	`379`
`378`		`- strncpy(remoteDebuggerServiceStr, remoteDebuggerPrefix, strlen(remoteDebuggerPrefix) + 1);`
`379`		`- strncat(remoteDebuggerServiceStr, cmdData->rfcvalue, strlen(cmdData->rfcvalue));`
	`380`	`+ strncpy(remoteDebuggerServiceStr, remoteDebuggerPrefix, sizeof(remoteDebuggerServiceStr) - 1);`
	`381`	`+ remoteDebuggerServiceStr[sizeof(remoteDebuggerServiceStr) - 1] = '\0';`
	`382`	`+ strncat(remoteDebuggerServiceStr, cmdData->rfcvalue, sizeof(remoteDebuggerServiceStr) - strlen(remoteDebuggerServiceStr) - 1);`
`380`	`383`
`381`	`384`	`removeQuotes(cmdData->command);`
`382`	`385`
`@@ -389,8 +392,8 @@ bool executeCommands(issueData *cmdinfo)`
`389`	`392`	`{`
`390`	`393`	`RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: Starting remote_debugger_%s service success...\n",__FUNCTION__,__LINE__,cmdData->rfcvalue);`
`391`	`394`	`copyDebugLogDestFile(systemdfp, filePointer);`
	`395`	`+ v_secure_pclose(systemdfp);`
`392`	`396`	`}`
`393`		`- v_secure_pclose(systemdfp);`
`394`	`397`
`395`	`398`	`/Logging output using journalctl to Output file/`
`396`	`399`	`RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: Using journalctl to log command output...\n",__FUNCTION__,__LINE__);`
`@@ -403,9 +406,8 @@ bool executeCommands(issueData *cmdinfo)`
`403`	`406`	`{`
`404`	`407`	`RDK_LOG(RDK_LOG_INFO,LOG_REMDEBUG,"[%s:%d]: journalctl remote_debugger_%s service success...\n",__FUNCTION__,__LINE__,cmdData->rfcvalue);`
`405`	`408`	`copyDebugLogDestFile(journalctlfp, filePointer);`
	`409`	`+ v_secure_pclose(journalctlfp);`
`406`	`410`	`}`
`407`		`-`
`408`		`- v_secure_pclose(journalctlfp);`
`409`	`411`
`410`	`412`	`/* Close debug_output.txt file*/`
`411`	`413`	`fclose(filePointer);`