Merge pull request #1490 from ddpbsd/coverity_20180806

Coverity fixes

Author: atomicturtle

src/addagent/validate.c

@@ -100,7 +100,9 @@ int OS_RemoveAgent(const char *u_id) {
         return 0;
 
 #ifndef WIN32
-    chmod(AUTH_FILE, 0440);
+    if((chmod(AUTH_FILE, 0440)) < 0) {
+        merror("addagent: ERROR: Cannot chmod %s: %s", AUTH_FILE, strerror(errno));
+    }
 #endif
 
 #ifdef REUSE_ID

src/monitord/sendcustomemail.c

@@ -191,7 +191,12 @@ int OS_SendCustomEmail2(char **to, char *subject, char *smtpserver, char *from,
     if (replyto) {
         memset(snd_msg, '\0', 128);
         snprintf(snd_msg, 127, REPLYTO, replyto);
-        OS_SendTCP(socket, snd_msg);
+        if(sendmail) {
+            fprintf(sendmail, "%s", snd_msg);
+        } else {
+            OS_SendTCP(socket, snd_msg);
+        }
+
     }
 
     /* Add CCs */
@@ -269,6 +274,12 @@ int OS_SendCustomEmail2(char **to, char *subject, char *smtpserver, char *from,
     fp = fopen(fname2, "r");
     if(!fp) {
         merror("%s: ERROR: Cannot open %s: %s", __local_name, fname2, strerror(errno));
+        if(socket) {
+            close(socket);
+        }
+        if(sendmail) {
+            pclose(sendmail);
+        }
         return(1);
     }
 

src/os_auth/main-server.c

@@ -109,6 +109,11 @@ char *__generatetmppass()
     snprintf(str1, STR_SIZE, "%d%d%s%d%s%s",(int)time(0), rand1, muname, rand2, md3, md4);
     OS_MD5_Str(str1, md1);
     fstring = strdup(md1);
+    free(rand3);
+    free(rand4);
+    if(muname) {
+        free(muname);
+    }
     return(fstring);
 }
 

src/os_maild/sendcustomemail.c

@@ -191,7 +191,11 @@ int OS_SendCustomEmail(char **to, char *subject, char *smtpserver, char *from, c
     if (replyto) {
         memset(snd_msg, '\0', 128);
         snprintf(snd_msg, 127, REPLYTO, replyto);
-        OS_SendTCP(socket, snd_msg);
+        if(sendmail) {
+            fprintf(sendmail, "%s", snd_msg);
+        } else {
+            OS_SendTCP(socket, snd_msg);
+        }
     }
 
     /* Add CCs */
@@ -260,6 +264,12 @@ int OS_SendCustomEmail(char **to, char *subject, char *smtpserver, char *from, c
     fp = fopen(fname, "r");
     if(!fp) {
         merror("%s: ERROR: Cannot open %s: %s", __local_name, fname, strerror(errno));
+        if(socket) {
+            close(socket);
+        }
+        if(sendmail) {
+            pclose(sendmail);
+        }
         return(1);
     }
 

src/os_net/os_net.c

@@ -371,6 +371,9 @@ int OS_Connect(char *_port, unsigned int protocol, const char *_ip)
     s = getaddrinfo(_ip, _port, &hints, &result);
     if (s != 0) {
         verbose("getaddrinfo: %s", gai_strerror(s));
+        if(result) {
+            freeaddrinfo(result);
+        }
         return(OS_INVALID);
     }
 
@@ -401,6 +404,9 @@ int OS_Connect(char *_port, unsigned int protocol, const char *_ip)
     }
     if (rp == NULL) {               /* No address succeeded */
         OS_CloseSocket(ossock);
+        if(result) {
+            freeaddrinfo(result);
+        }
         return(OS_SOCKTERR);
     }
     satop(rp->ai_addr, tempaddr, sizeof tempaddr);

src/shared/file_op.c

@@ -366,6 +366,7 @@ char *GetRandomNoise()
 {
     FILE *fp;
     char buf[2048 + 1];
+    size_t frr = 0;
 
     /* Reading urandom */
     fp = fopen("/dev/urandom", "r");
@@ -375,7 +376,12 @@ char *GetRandomNoise()
     }
 
     buf[2048] = '\0';
-    fread(buf, 1, 2048, fp);
+    frr = fread(buf, 1, 2048, fp);
+    if(frr == 0) {
+        merror("ERROR: GetRandomNoise() fread() returned 0.");
+        fclose(fp);
+        return(NULL);
+    }
     return(strdup(buf));
 }
 

src/shared/rules_op.c

@@ -609,7 +609,7 @@ int OS_ReadXMLRules(const char *rulefile,
                         config_ruleinfo->ckignore |= FTS_LOCATION;
                     }
                     if (strstr(rule_opt[k]->content, "data") != NULL) {
-                        config_ruleinfo->ignore |= FTS_DATA;
+                        config_ruleinfo->ckignore |= FTS_DATA;
                     }
                     if (strstr(rule_opt[k]->content, "name") != NULL) {
                         config_ruleinfo->ckignore |= FTS_NAME;

src/shared/validate_op.c

@@ -382,7 +382,7 @@ int sacmp(struct sockaddr *sa1, struct sockaddr *sa2, int prefixlength)
         realaf2 = AF_INET6;
         if (IN6_IS_ADDR_V4MAPPED((struct in6_addr *) addr2)) {
             /* shift the pointer for a mapped address */
-            addr1 += (sizeof (struct in6_addr)) - (sizeof (struct in_addr));
+            addr2 += (sizeof (struct in6_addr)) - (sizeof (struct in_addr));
             realaf2 = AF_INET;
         }
         break;

src/syscheckd/run_realtime.c

@@ -184,6 +184,7 @@ int realtime_process()
     if (len < 0) {
         merror("%s: ERROR: Unable to read from real time buffer.", ARGV0);
     } else if (len > 0) {
+        buf[len] = '\0';
         while (i < (size_t) len) {
             event = (struct inotify_event *) (void *) &buf[i];
 

src/syscheckd/seechanges.c

@@ -299,7 +299,9 @@ char *seechanges_addfile(const char *filename)
     );
 
 
-    rename(old_location, tmp_location);
+    if((rename(old_location, tmp_location)) < 0) {
+        merror("%s: ERROR rename of %s failed: %s", ARGV0, old_location, strerror(errno));
+    }
     if(seechanges_dupfile(filename, old_location) != 1)
     {
         merror("%s: ERROR: Unable to create snapshot for %s",ARGV0, filename);