Merge pull request #3700 from brauner/2021-02-26/fixes_2

src/lxc/af_unix.c

@@ -182,6 +182,12 @@ static ssize_t lxc_abstract_unix_recv_fds_iov(int fd,
 	if (hweight32((ret_fds->flags & ~UNIX_FDS_ACCEPT_NONE)) > 1)
 		return ret_errno(EINVAL);
 
+	if (ret_fds->fd_count_max >= KERNEL_SCM_MAX_FD)
+		return ret_errno(EINVAL);
+
+	if (ret_fds->fd_count_ret != 0)
+		return ret_errno(EINVAL);
+
 	cmsgbuf = zalloc(cmsgbufsize);
 	if (!cmsgbuf)
 		return ret_errno(ENOMEM);

src/lxc/start.c

@@ -1239,7 +1239,7 @@ static int do_start(void *data)
 			}
 
 			ret = setns(timens_fd, CLONE_NEWTIME);
- 			if (ret) {
+			if (ret) {
 				SYSERROR("Failed to setns(%d(\"/proc/self/ns/time_for_children\"))", timens_fd);
 				goto out_warn_father;
 			}