memfd: replace ratcheting feature from vm.memfd_noexec with hierarchy

[linux-2.6-block.git] / kernel / pid.c

diff --git a/kernel/pid.c b/kernel/pid.c
index 6a1d23a11026c01fa814ecf15765bb33a0921b73..fee14a4486a310ee650e1249b3a85d0719f9a7a7 100644 (file)
--- a/kernel/pid.c
+++ b/kernel/pid.c
@@ -83,6 +83,9 @@ struct pid_namespace init_pid_ns = {
 #ifdef CONFIG_PID_NS
        .ns.ops = &pidns_operations,
 #endif
+#if defined(CONFIG_SYSCTL) && defined(CONFIG_MEMFD_CREATE)
+       .memfd_noexec_scope = MEMFD_NOEXEC_SCOPE_EXEC,
+#endif
 };
 EXPORT_SYMBOL_GPL(init_pid_ns);