summaryrefslogtreecommitdiff
path: root/kernel/fork.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2023-03-13 13:20:52 +0000
committerMark Brown <broonie@kernel.org>2023-03-13 13:20:52 +0000
commit83c05c97a325abdd8b4209b9c7165f1701081ba1 (patch)
tree50a3e0cd65c8453ef43299faf3bd07cc7e2ab0c4 /kernel/fork.c
parent054a0da568b94f6b69ccf34b80f7c41a6623eb11 (diff)
parenteeac8ede17557680855031c6f305ece2378af326 (diff)
Merge tag 'v6.3-rc2' into regmap-6.4 to fix clock related boot issues
Linux 6.3-rc2
Diffstat (limited to 'kernel/fork.c')
-rw-r--r--kernel/fork.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c
index f68954d05e89..d8cda4c6de6c 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -2936,7 +2936,7 @@ static bool clone3_args_valid(struct kernel_clone_args *kargs)
* - make the CLONE_DETACHED bit reusable for clone3
* - make the CSIGNAL bits reusable for clone3
*/
- if (kargs->flags & (CLONE_DETACHED | CSIGNAL))
+ if (kargs->flags & (CLONE_DETACHED | (CSIGNAL & (~CLONE_NEWTIME))))
return false;
if ((kargs->flags & (CLONE_SIGHAND | CLONE_CLEAR_SIGHAND)) ==