MIPS: msp: Record prom memory

[linux.git] / kernel / fork.c

diff --git a/kernel/fork.c b/kernel/fork.c
index dfa78985a6fd50fef36fac24a091eb20563fd716..d8ae0f1b4148023c8c0d242b799039deb362ca09 100644 (file)
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -2405,6 +2405,16 @@ long _do_fork(struct kernel_clone_args *args)
        return nr;
 }
 
        return nr;
 }
 

+bool legacy_clone_args_valid(const struct kernel_clone_args *kargs)
+{
+       /* clone(CLONE_PIDFD) uses parent_tidptr to return a pidfd */
+       if ((kargs->flags & CLONE_PIDFD) &&
+           (kargs->flags & CLONE_PARENT_SETTID))
+               return false;
+
+       return true;
+}
+

 #ifndef CONFIG_HAVE_COPY_THREAD_TLS
 /* For compatibility with architectures that call do_fork directly rather than
  * using the syscall entry points below. */
 #ifndef CONFIG_HAVE_COPY_THREAD_TLS
 /* For compatibility with architectures that call do_fork directly rather than
  * using the syscall entry points below. */


@@ -2416,6 +2426,7 @@ long do_fork(unsigned long clone_flags,
 {
        struct kernel_clone_args args = {
                .flags          = (clone_flags & ~CSIGNAL),
 {
        struct kernel_clone_args args = {
                .flags          = (clone_flags & ~CSIGNAL),

+               .pidfd          = parent_tidptr,

                .child_tid      = child_tidptr,
                .parent_tid     = parent_tidptr,
                .exit_signal    = (clone_flags & CSIGNAL),
                .child_tid      = child_tidptr,
                .parent_tid     = parent_tidptr,
                .exit_signal    = (clone_flags & CSIGNAL),


@@ -2423,6 +2434,9 @@ long do_fork(unsigned long clone_flags,
                .stack_size     = stack_size,
        };
 
                .stack_size     = stack_size,
        };
 

+       if (!legacy_clone_args_valid(&args))
+               return -EINVAL;
+

        return _do_fork(&args);
 }
 #endif
        return _do_fork(&args);
 }
 #endif


@@ -2504,8 +2518,7 @@ SYSCALL_DEFINE5(clone, unsigned long, clone_flags, unsigned long, newsp,
                .tls            = tls,
        };
 
                .tls            = tls,
        };
 

-       /* clone(CLONE_PIDFD) uses parent_tidptr to return a pidfd */
-       if ((clone_flags & CLONE_PIDFD) && (clone_flags & CLONE_PARENT_SETTID))
+       if (!legacy_clone_args_valid(&args))

                return -EINVAL;
 
        return _do_fork(&args);
                return -EINVAL;
 
        return _do_fork(&args);