Merge pull request #2327 from brauner/2018-05-15/coverity

src/lxc/network.c

@@ -1916,8 +1916,10 @@ int lxc_bridge_attach(const char *bridge, const char *ifname)
 		return -errno;
 
 	retlen = strlcpy(ifr.ifr_name, bridge, IFNAMSIZ);
-	if (retlen >= IFNAMSIZ)
+	if (retlen >= IFNAMSIZ) {
+		close(fd);
 		return -E2BIG;
+	}
 
 	ifr.ifr_name[IFNAMSIZ - 1] = '\0';
 	ifr.ifr_ifindex = index;

src/lxc/storage/btrfs.c

@@ -254,8 +254,11 @@ static int btrfs_subvolume_create(const char *path)
 
 	memset(&args, 0, sizeof(args));
 	retlen = strlcpy(args.name, p + 1, BTRFS_SUBVOL_NAME_MAX);
-	if (retlen >= BTRFS_SUBVOL_NAME_MAX)
+	if (retlen >= BTRFS_SUBVOL_NAME_MAX) {
+		free(newfull);
+		close(fd);
 		return -E2BIG;
+	}
 
 	ret = ioctl(fd, BTRFS_IOC_SUBVOL_CREATE, &args);
 	saved_errno = errno;
@@ -533,6 +536,7 @@ static int btrfs_do_destroy_subvol(const char *path)
 	retlen = strlcpy(args.name, p+1, BTRFS_SUBVOL_NAME_MAX);
 	if (retlen >= BTRFS_SUBVOL_NAME_MAX) {
 		free(newfull);
+		close(fd);
 		return -E2BIG;
 	}