Merge pull request #304 from bergwolf/coverity

fix a couple of Coverity warnings

Author: gao-feng

src/exec.c

@@ -197,7 +197,7 @@ static int hyper_setup_exec_user(struct hyper_exec *exec)
 
 	uid_t uid = 0;
 	gid_t gid = 0;
-	int ngroups;
+	int ngroups = 0;
 	gid_t *reallocgroups, *groups = NULL;
 
 	// check the config
@@ -261,7 +261,7 @@ static int hyper_setup_exec_user(struct hyper_exec *exec)
 		struct group *gr = hyper_getgrnam(group);
 		if (gr == NULL) {
 			perror("can't find the group");
-			return -1;
+			goto fail;
 		}
 		gid = gr->gr_gid;
 	}
@@ -414,8 +414,12 @@ static int hyper_install_process_stdio(struct hyper_exec *e, struct stdio_config
 
 		sprintf(ptmx, "/dev/pts/%d", e->ptyno);
 		ptyslave = open(ptmx, O_RDWR | O_CLOEXEC);
-		if (ptyslave < 0 || ioctl(ptyslave, TIOCSCTTY, NULL) < 0) {
+		if (ptyslave < 0) {
+			perror("open pty device for execcmd failed");
+			goto out;
+		} if (ioctl(ptyslave, TIOCSCTTY, NULL) < 0) {
 			perror("ioctl pty device for execcmd failed");
+			close(ptyslave);
 			goto out;
 		}
 		io->stdinfd = ptyslave;

src/init.c

@@ -132,7 +132,7 @@ static void hyper_term_all(struct hyper_pod *pod)
 	int pid;
 	DIR *dp;
 	struct dirent *de;
-	pid_t *pids = NULL;
+	pid_t *pidsnew, *pids = NULL;
 	struct hyper_exec *e;
 	pid_t hyperstart_pid;
 
@@ -152,9 +152,13 @@ static void hyper_term_all(struct hyper_pod *pod)
 		if (pid == hyperstart_pid)
 			continue;
 		if (index <= npids) {
-			pids = realloc(pids, npids + 16384);
-			if (pids == NULL)
+			pidsnew = realloc(pids, npids + 16384);
+			if (pidsnew == NULL) {
+				free(pids);
+				closedir(dp);
 				return;
+			}
+			pids = pidsnew;
 			npids += 16384;
 		}
 
@@ -546,12 +550,15 @@ static void hyper_print_uptime(void)
 {
 	char buf[128];
 	int fd = open("/proc/uptime", O_RDONLY);
+	int n;
 
 	if (fd < 0)
 		return;
-	memset(buf, 0, sizeof(buf));
-	if (read(fd, buf, sizeof(buf)))
+	n = read(fd, buf, sizeof(buf)-1);
+	if (n > 0) {
+		buf[n] = 0;
 		fprintf(stdout, "uptime %s\n", buf);
+	}
 
 	close(fd);
 }

src/net.c

@@ -683,7 +683,7 @@ int hyper_setup_hostname(struct hyper_pod *pod)
 int hyper_write_dns_file(int fd, char *field, char **data, int num)
 {
 	int i = 0, len = 0, ret = -1, size;
-	char *buf = NULL;
+	char *newbuf, *buf = NULL;
 
 	if (num == 0)
 		return 0;
@@ -699,11 +699,12 @@ int hyper_write_dns_file(int fd, char *field, char **data, int num)
 	for (i = 0; i < num; i++) {
 		// 1 for space
 		int new_size = size + strlen(data[i]) + 1;
-		buf = realloc(buf, new_size);
-		if (buf == NULL) {
+		newbuf = realloc(buf, new_size + 1);
+		if (newbuf == NULL) {
 			fprintf(stderr, "fail to realloc buff for %s\n", field);
 			goto out;
 		}
+		buf = newbuf;
 		buf[size]= ' ';
 		memcpy(buf + size + 1, data[i], strlen(data[i]));
 		fprintf(stdout, "%s: data: %s\n", field, buf);

src/parse.c

@@ -1075,7 +1075,7 @@ static int hyper_parse_string_array(char *json, jsmntok_t *toks, char *field,
 	dbg_pr(stdout, "%s count %d\n", field, *num);
 
 	values = calloc(*num, sizeof(*values));
-	if (data == NULL) {
+	if (values == NULL) {
 		dbg_pr(stdout, "alloc memory for %s failed\n", field);
 		return -1;
 	}

src/util.c

@@ -683,8 +683,12 @@ int hyper_open_channel(char *channel, int mode)
 		fd = open(path, O_RDONLY);
 
 		memset(name, 0, sizeof(name));
-		if (fd < 0 || read(fd, name, sizeof(name)) < 0)
+		if (fd < 0)
+			continue;
+		if (read(fd, name, sizeof(name)) < 0) {
+			close(fd);
 			continue;
+		}
 
 		close(fd);
 		fd = -1;