Code cleanup from static analysis

RH-steve-grubb · RH-steve-grubb · commit f0a7b4c3d728 · 2017-09-18T13:39:06.000-04:00
diff --git a/audisp/audispd.c b/audisp/audispd.c
@@ -498,7 +498,12 @@ static int safe_exec(plugin_conf_t *conf)
 	}
 
 	/* Set up comm with child */
-	dup2(conf->plug_pipe[0], 0);
+	if (dup2(conf->plug_pipe[0], 0) < 0) {
+		close(conf->plug_pipe[0]);
+		close(conf->plug_pipe[1]);
+		conf->pid = 0;
+		return -1;	/* Failed to fork */
+	}
 	for (i=3; i<24; i++)	 /* Arbitrary number */
 		close(i);
 
diff --git a/audisp/plugins/remote/audisp-remote.c b/audisp/plugins/remote/audisp-remote.c
@@ -1254,26 +1254,30 @@ static int recv_msg_gss (unsigned char *header, char *msg, uint32_t *mlen)
 
 	if (utok.length < AUDIT_RMW_HEADER_SIZE) {
 		sync_error_handler ("message too short");
+		free (utok.value);
 		return -1;
 	}
 	memcpy (header, utok.value, AUDIT_RMW_HEADER_SIZE);
 
 	if (! AUDIT_RMW_IS_MAGIC (header, AUDIT_RMW_HEADER_SIZE)) {
 		sync_error_handler ("bad magic number");
+		free (utok.value);
 		return -1;
 	}
 
 	AUDIT_RMW_UNPACK_HEADER (header, hver, mver, type, rlen, seq);
 
 	if (rlen > MAX_AUDIT_MESSAGE_LENGTH) {
 		sync_error_handler ("message too long");
+		free (utok.value);
 		return -1;
 	}
 
 	memcpy (msg, utok.value+AUDIT_RMW_HEADER_SIZE, rlen);
 
 	*mlen = rlen;
 
+	free (utok.value);
 	return 0;
 }
 #endif
diff --git a/audisp/plugins/zos-remote/zos-remote-plugin.c b/audisp/plugins/zos-remote/zos-remote-plugin.c
@@ -572,8 +572,7 @@ int main(int argc, char *argv[])
                 alarm(0);                   /* cancel any pending alarm */
                 auparse_destroy(au);                               /* 2 */
                 plugin_free_config(&conf);                                /* 1 */
-        }
-        while (hup && stop == 0);
+        } while (hup && stop == 0);
         
         /* destroy queue before leaving */
         destroy_queue();
diff --git a/auparse/auditd-config.c b/auparse/auditd-config.c
@@ -206,10 +206,10 @@ static char *get_line(auparse_state_t *au, FILE *f, char *buf, unsigned size,
 			too_long = 0;
 			*lineno = *lineno + 1;
 		} else {
-		// If a line is too long skip it.
-		// Only output 1 warning
-		if (!too_long)
-			audit_msg(au, LOG_ERR,
+			// If a line is too long skip it.
+			// Only output 1 warning
+			if (!too_long)
+				audit_msg(au, LOG_ERR,
 					"Skipping line %d in %s: too long",
 					*lineno, file);
 			too_long = 1;
diff --git a/auparse/data_buf.c b/auparse/data_buf.c
@@ -105,18 +105,12 @@ static int debug = 0;
 static inline char *databuf_end(DataBuf *db)
 {return (db->alloc_ptr == NULL) ? NULL : db->alloc_ptr+db->offset+db->len;}
 
-static inline char *databuf_alloc_end(DataBuf *db)
-{return (db->alloc_ptr == NULL) ? NULL : db->alloc_ptr+db->alloc_size;}
-
 static inline int databuf_tail_size(DataBuf *db)
 {return db->alloc_size - (db->offset+db->len);}
 
 static inline int databuf_tail_available(DataBuf *db, size_t append_len)
 {return append_len <= databuf_tail_size(db);}
 
-static inline size_t databuf_free_size(DataBuf *db)
-{return db->alloc_size-db->len;}
-
 /*****************************************************************************/
 /***************************  Internal Functions  ****************************/
 /*****************************************************************************/
diff --git a/auparse/interpret.c b/auparse/interpret.c
@@ -778,7 +778,7 @@ static const char *print_exit(const char *val)
 
 static char *print_escaped(const char *val)
 {
-	const char *out;
+	char *out;
 
         if (*val == '"') {
                 char *term;
@@ -2585,7 +2585,7 @@ static const char *print_list(const char *val)
 		if (asprintf(&out, "conversion error(%s)", val) < 0)
 			out = NULL;
 	} else {
-		char *o = audit_flag_to_name(i);
+		const char *o = audit_flag_to_name(i);
 		if (o != NULL)
 			out = strdup(o);
 		else if (asprintf(&out, "unknown-list(%s)", val) < 0)
diff --git a/auparse/lru.c b/auparse/lru.c
@@ -61,6 +61,10 @@ static Hash *create_hash(unsigned int hsize)
 		return hash;
 
 	hash->array = malloc(hsize * sizeof(QNode*));
+	if (hash->array == NULL) {
+		free(hash);
+		return NULL;
+	}
  
 	// Initialize all hash entries as empty
 	for (i = 0; i < hsize; i++)
diff --git a/auparse/normalize.c b/auparse/normalize.c
@@ -679,7 +679,7 @@ static int normalize_syscall(auparse_state_t *au, const char *syscall, int type)
 			break;
 		default:
 			{
-				char *k;
+				const char *k;
 				rc = auparse_first_record(au);
 				k = auparse_find_field(au, "key");
 				if (k && strcmp(k, "(null)")) {
diff --git a/src/auditd-listen.c b/src/auditd-listen.c
@@ -369,6 +369,7 @@ static int negotiate_credentials (ev_tcp *io)
 
 	context = & io->gss_context;
 	*context = GSS_C_NO_CONTEXT;
+	io->remote_name = NULL;
 
 	maj_stat = GSS_S_CONTINUE_NEEDED;
 	do {
@@ -380,8 +381,11 @@ static int negotiate_credentials (ev_tcp *io)
 				  sockaddr_to_addr4(&io->addr));
 			return -1;
 		}
-		if (recv_tok.length == 0)
+		if (recv_tok.length == 0) {
+			free(recv_tok.value);
+			recv_tok.value = NULL;
 			continue;
+		}
 
 		/* STEP 2 - let GSS process that token.  */
 
@@ -847,6 +851,7 @@ static void auditd_tcp_listen_handler( struct ev_loop *loop,
 	if (use_gss && negotiate_credentials (client)) {
 		shutdown(afd, SHUT_RDWR);
 		close(afd);
+		free(client->remote_name);
 		free(client);
 		return;
 	}
diff --git a/src/ausearch-checkpt.c b/src/ausearch-checkpt.c
@@ -204,6 +204,7 @@ int load_ChkPt(const char *fn)
 			fn, strerror(errno));
 		return -2;
 	}
+	chkpt_input_levent.node = NULL;
 	while (fgets(lbuf, MAX_LN, fd) != NULL) {
 		size_t len = strlen(lbuf);
 
@@ -229,6 +230,8 @@ int load_ChkPt(const char *fn)
 				break;
 			}
 		} else if (strncmp(lbuf, "output=", 7) == 0) {
+			free((void *)chkpt_input_levent.node);
+			chkpt_input_levent.node = NULL;
 			if (parse_checkpt_event(lbuf, 7, &chkpt_input_levent))
 				break;
 		} else {
diff --git a/src/ausearch-parse.c b/src/ausearch-parse.c
@@ -1009,6 +1009,7 @@ static int parse_user(const lnode *n, search_items *s)
 			if (errno)
 				return 15;
 			*term = saved;
+			if (s->tuid) free(s->tuid);
 			s->tuid = lookup_uid("uid", s->uid);
 		}
 	}
diff --git a/src/ausearch-report.c b/src/ausearch-report.c
@@ -531,7 +531,7 @@ static void csv_event(auparse_state_t *au,
 	// SUBJ_PRIME
 	rc = auparse_normalize_subject_primary(au);
 	if (rc == 1) {
-		char *subj = auparse_interpret_field(au);
+		const char *subj = auparse_interpret_field(au);
 		if (strcmp(subj, "unset") == 0)
 			subj = "system";
 		printf("%s", subj);
diff --git a/src/ausearch-time.c b/src/ausearch-time.c
@@ -165,7 +165,7 @@ static void set_tm_this_week(struct tm *d)
         d->tm_sec = 0;          /* seconds */
         d->tm_min = 0;          /* minutes */
         d->tm_hour = 0;         /* hours */
-	t -= (time_t)(tv->tm_wday*SECONDS_IN_DAY);
+	t -= (time_t)(tv->tm_wday*(time_t)SECONDS_IN_DAY);
         tv = localtime(&t);
 	replace_date(d, tv);
 }
diff --git a/tools/auvirt/auvirt.c b/tools/auvirt/auvirt.c
@@ -72,7 +72,7 @@ struct event {
 	enum event_type type;
 	time_t start;
 	time_t end;
-	char *user;
+	const char *user;
 	char *uuid;
 	char *name;
 	int success;
@@ -380,7 +380,7 @@ int extract_virt_fields(auparse_state_t *au, const char **p_uuid,
 
 	/* Order matters */
 	if (p_user) {
-		char *t;
+		const char *t;
 		if (!auparse_find_field(au, field = "uid"))
 			goto error;
 		t = auparse_interpret_field(au);
@@ -484,8 +484,10 @@ int process_machine_id_event(auparse_state_t *au)
 		return 0;
 
 	event = event_alloc();
-	if (event == NULL)
+	if (event == NULL) {
+		free(user);
 		return 1;
+	}
 	event->type = ET_MACHINE_ID;
 	event->uuid = copy_str(uuid);
 	event->name = copy_str(name);
@@ -867,12 +869,15 @@ int process_avc_selinux_context(auparse_state_t *au, const char *context)
 			fprintf(stderr, "Couldn't get the security "
 					"level from the AVC event.\n");
 		}
+		free(user);
 		return 0;
 	}
 
 	avc = event_alloc();
-	if (avc == NULL)
+	if (avc == NULL) {
+		free(user);
 		return 1;
+	}
 	avc->type = ET_AVC;
 
 	/* Guest info */

Original file line number	Diff line number	Diff line change
`@@ -1254,26 +1254,30 @@ static int recv_msg_gss (unsigned char header, char msg, uint32_t *mlen)`
`1254`	`1254`
`1255`	`1255`	`if (utok.length < AUDIT_RMW_HEADER_SIZE) {`
`1256`	`1256`	`sync_error_handler ("message too short");`
	`1257`	`+ free (utok.value);`
`1257`	`1258`	`return -1;`
`1258`	`1259`	`}`
`1259`	`1260`	`memcpy (header, utok.value, AUDIT_RMW_HEADER_SIZE);`
`1260`	`1261`
`1261`	`1262`	`if (! AUDIT_RMW_IS_MAGIC (header, AUDIT_RMW_HEADER_SIZE)) {`
`1262`	`1263`	`sync_error_handler ("bad magic number");`
	`1264`	`+ free (utok.value);`
`1263`	`1265`	`return -1;`
`1264`	`1266`	`}`
`1265`	`1267`
`1266`	`1268`	`AUDIT_RMW_UNPACK_HEADER (header, hver, mver, type, rlen, seq);`
`1267`	`1269`
`1268`	`1270`	`if (rlen > MAX_AUDIT_MESSAGE_LENGTH) {`
`1269`	`1271`	`sync_error_handler ("message too long");`
	`1272`	`+ free (utok.value);`
`1270`	`1273`	`return -1;`
`1271`	`1274`	`}`
`1272`	`1275`
`1273`	`1276`	`memcpy (msg, utok.value+AUDIT_RMW_HEADER_SIZE, rlen);`
`1274`	`1277`
`1275`	`1278`	`*mlen = rlen;`
`1276`	`1279`
	`1280`	`+ free (utok.value);`
`1277`	`1281`	`return 0;`
`1278`	`1282`	`}`
`1279`	`1283`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -679,7 +679,7 @@ static int normalize_syscall(auparse_state_t au, const char syscall, int type)`
`679`	`679`	`break;`
`680`	`680`	`default:`
`681`	`681`	`{`
`682`		`- char *k;`
	`682`	`+ const char *k;`
`683`	`683`	`rc = auparse_first_record(au);`
`684`	`684`	`k = auparse_find_field(au, "key");`
`685`	`685`	`if (k && strcmp(k, "(null)")) {`