summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2025-03-06 08:04:49 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2025-03-06 08:04:49 -1000
commit7f0e9ee5e44887272627d0fcde0b19a675daf597 (patch)
tree9eba04c31829275f52897fd588e473fb71ac68ab /kernel
parentebb0f38bb47f74b29e267babdbcd2c47d5292aa8 (diff)
parentd385c8bceb14665e935419334aa3d3fac2f10456 (diff)
downloadlinux-7f0e9ee5e44887272627d0fcde0b19a675daf597.tar.gz
linux-7f0e9ee5e44887272627d0fcde0b19a675daf597.tar.bz2
linux-7f0e9ee5e44887272627d0fcde0b19a675daf597.zip
Merge tag 'vfs-6.14-rc6.fixes' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs
Pull vfs fixes from Christian Brauner: - Fix spelling mistakes in idmappings.rst - Fix RCU warnings in override_creds()/revert_creds() - Create new pid namespaces with default limit now that pid_max is namespaced * tag 'vfs-6.14-rc6.fixes' of gitolite.kernel.org:pub/scm/linux/kernel/git/vfs/vfs: pid: Do not set pid_max in new pid namespaces doc: correcting two prefix errors in idmappings.rst cred: Fix RCU warnings in override/revert_creds
Diffstat (limited to 'kernel')
-rw-r--r--kernel/pid_namespace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
index 8f6cfec87555..7098ed44e717 100644
--- a/kernel/pid_namespace.c
+++ b/kernel/pid_namespace.c
@@ -107,7 +107,7 @@ static struct pid_namespace *create_pid_namespace(struct user_namespace *user_ns
goto out_free_idr;
ns->ns.ops = &pidns_operations;
- ns->pid_max = parent_pid_ns->pid_max;
+ ns->pid_max = PID_MAX_LIMIT;
err = register_pidns_sysctls(ns);
if (err)
goto out_free_inum;