Merge pull request #2409 from brauner/2018-06-15/coverity

src/lxc/conf.c

@@ -1541,16 +1541,11 @@ static int lxc_setup_devpts(struct lxc_conf *conf)
 	if (ret < 0 || (size_t)ret >= sizeof(devpts_mntopts))
 		return -1;
 
-	/* Unmount old devpts instance. */
-	ret = access("/dev/pts/ptmx", F_OK);
-	if (!ret) {
-		ret = umount("/dev/pts");
-		if (ret < 0) {
-			SYSERROR("Failed to unmount old devpts instance");
-			return -1;
-		}
+	ret = umount2("/dev/pts", MNT_DETACH);
+	if (ret < 0)
+		WARN("%s - Failed to unmount old devpts instance", strerror(errno));
+	else
 		DEBUG("Unmounted old devpts instance");
-	}
 
 	/* Create mountpoint for devpts instance. */
 	ret = mkdir("/dev/pts", 0755);

src/lxc/lxccontainer.c

@@ -2625,7 +2625,10 @@ static bool mod_rdep(struct lxc_container *c0, struct lxc_container *c, bool inc
 		n = fscanf(f1, "%d", &v);
 		fclose(f1);
 		if (n == 1 && v == 0) {
-			remove(path);
+			ret = remove(path);
+			if (ret < 0)
+				ERROR("%s - Failed to remove \"%s\"",
+				      strerror(errno), path);
 			n = 0;
 		}
 	}

src/lxc/tools/lxc_info.c

@@ -178,6 +178,7 @@ static void print_net_stats(struct lxc_container *c)
 
 		rc = lxc_read_from_file(path, buf, sizeof(buf));
 		if (rc > 0) {
+			buf[rc - 1] = '\0';
 			str_chomp(buf);
 			rx_bytes = str_size_humanize(buf, sizeof(buf));
 			printf("%-15s %s\n", " TX bytes:", buf);
@@ -190,6 +191,7 @@ static void print_net_stats(struct lxc_container *c)
 
 		rc = lxc_read_from_file(path, buf, sizeof(buf));
 		if (rc > 0) {
+			buf[rc - 1] = '\0';
 			str_chomp(buf);
 			tx_bytes = str_size_humanize(buf, sizeof(buf));
 			printf("%-15s %s\n", " RX bytes:", buf);

src/lxc/tools/lxc_ls.c

@@ -819,8 +819,8 @@ static void ls_print_fancy_format(struct ls *l, struct lengths *lht,
 		    strcasecmp(*s, "GROUPS") && strcasecmp(*s, "INTERFACE") &&
 		    strcasecmp(*s, "IPV4") && strcasecmp(*s, "IPV6") &&
 		    strcasecmp(*s, "UNPRIVILEGED")) {
-			lxc_free_array((void **)tmp, free);
 			fprintf(stderr, "Invalid key: %s\n", *s);
+			lxc_free_array((void **)tmp, free);
 			return;
 		}
 	}