Commit 1e396a5d authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'threads-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux

Pull thread updates from Christian Brauner:
 "The main change for this cycle was the extension for clone3() to
  support spawning processes directly into cgroups via CLONE_INTO_CGROUP
  (commit ef2c41cf: "clone3: allow spawning processes
  into cgroups").

  But since I had to touch kernel/cgroup/ quite a bit I had Tejun route
  that through his tree this time around to make it easier for him to
  handle other changes.

  So here is just the unexciting leftovers: a regression test for the
  ENOMEM regression we fixed in commit b26ebfe1 ("pid: Fix error
  return value in some cases") verifying that we report ENOMEM when
  trying to create a new process in a pid namespace whose init
  process/subreaper has already exited"

* tag 'threads-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux:
  selftests: add pid namespace ENOMEM regression test
parents 2fb732b3 6952a4f6
...@@ -13285,6 +13285,7 @@ S: Maintained ...@@ -13285,6 +13285,7 @@ S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git
F: samples/pidfd/ F: samples/pidfd/
F: tools/testing/selftests/pidfd/ F: tools/testing/selftests/pidfd/
F: tools/testing/selftests/pid_namespace/
F: tools/testing/selftests/clone3/ F: tools/testing/selftests/clone3/
K: (?i)pidfd K: (?i)pidfd
K: (?i)clone3 K: (?i)clone3
......
...@@ -38,6 +38,7 @@ TARGETS += net/mptcp ...@@ -38,6 +38,7 @@ TARGETS += net/mptcp
TARGETS += netfilter TARGETS += netfilter
TARGETS += nsfs TARGETS += nsfs
TARGETS += pidfd TARGETS += pidfd
TARGETS += pid_namespace
TARGETS += powerpc TARGETS += powerpc
TARGETS += proc TARGETS += proc
TARGETS += pstore TARGETS += pstore
......
# SPDX-License-Identifier: GPL-2.0
CFLAGS += -g -I../../../../usr/include/
TEST_GEN_PROGS := regression_enomem
include ../lib.mk
$(OUTPUT)/regression_enomem: regression_enomem.c ../pidfd/pidfd.h
CONFIG_PID_NS=y
CONFIG_USER_NS=y
#define _GNU_SOURCE
#include <assert.h>
#include <errno.h>
#include <fcntl.h>
#include <linux/types.h>
#include <sched.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <syscall.h>
#include <sys/wait.h>
#include "../kselftest.h"
#include "../kselftest_harness.h"
#include "../pidfd/pidfd.h"
/*
* Regression test for:
* 35f71bc0a09a ("fork: report pid reservation failure properly")
* b26ebfe12f34 ("pid: Fix error return value in some cases")
*/
TEST(regression_enomem)
{
pid_t pid;
if (geteuid())
EXPECT_EQ(0, unshare(CLONE_NEWUSER));
EXPECT_EQ(0, unshare(CLONE_NEWPID));
pid = fork();
ASSERT_GE(pid, 0);
if (pid == 0)
exit(EXIT_SUCCESS);
EXPECT_EQ(0, wait_for_pid(pid));
pid = fork();
ASSERT_LT(pid, 0);
ASSERT_EQ(errno, ENOMEM);
}
TEST_HARNESS_MAIN
...@@ -13,6 +13,8 @@ ...@@ -13,6 +13,8 @@
#include <string.h> #include <string.h>
#include <syscall.h> #include <syscall.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <sys/types.h>
#include <sys/wait.h>
#include "../kselftest.h" #include "../kselftest.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment