Merge tag 'nfs-for-5.18-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux-2.6-microblaze.git] / kernel / ptrace.c

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index eea2650..ccc4b46 100644 (file)
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -371,6 +371,26 @@ bool ptrace_may_access(struct task_struct *task, unsigned int mode)
        return !err;
 }
 
+static int check_ptrace_options(unsigned long data)
+{
+       if (data & ~(unsigned long)PTRACE_O_MASK)
+               return -EINVAL;
+
+       if (unlikely(data & PTRACE_O_SUSPEND_SECCOMP)) {
+               if (!IS_ENABLED(CONFIG_CHECKPOINT_RESTORE) ||
+                   !IS_ENABLED(CONFIG_SECCOMP))
+                       return -EINVAL;
+
+               if (!capable(CAP_SYS_ADMIN))
+                       return -EPERM;
+
+               if (seccomp_mode(&current->seccomp) != SECCOMP_MODE_DISABLED ||
+                   current->ptrace & PT_SUSPEND_SECCOMP)
+                       return -EPERM;
+       }
+       return 0;
+}
+
 static int ptrace_attach(struct task_struct *task, long request,
                         unsigned long addr,
                         unsigned long flags)
@@ -382,8 +402,16 @@ static int ptrace_attach(struct task_struct *task, long request,
        if (seize) {
                if (addr != 0)
                        goto out;
+               /*
+                * This duplicates the check in check_ptrace_options() because
+                * ptrace_attach() and ptrace_setoptions() have historically
+                * used different error codes for unknown ptrace options.
+                */
                if (flags & ~(unsigned long)PTRACE_O_MASK)
                        goto out;
+               retval = check_ptrace_options(flags);
+               if (retval)
+                       return retval;
                flags = PT_PTRACED | PT_SEIZED | (flags << PT_OPT_FLAG_SHIFT);
        } else {
                flags = PT_PTRACED;
@@ -654,22 +682,11 @@ int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long ds
 static int ptrace_setoptions(struct task_struct *child, unsigned long data)
 {
        unsigned flags;
+       int ret;
 
-       if (data & ~(unsigned long)PTRACE_O_MASK)
-               return -EINVAL;
-
-       if (unlikely(data & PTRACE_O_SUSPEND_SECCOMP)) {
-               if (!IS_ENABLED(CONFIG_CHECKPOINT_RESTORE) ||
-                   !IS_ENABLED(CONFIG_SECCOMP))
-                       return -EINVAL;
-
-               if (!capable(CAP_SYS_ADMIN))
-                       return -EPERM;
-
-               if (seccomp_mode(&current->seccomp) != SECCOMP_MODE_DISABLED ||
-                   current->ptrace & PT_SUSPEND_SECCOMP)
-                       return -EPERM;
-       }
+       ret = check_ptrace_options(data);
+       if (ret)
+               return ret;
 
        /* Avoid intermediate state when all opts are cleared */
        flags = child->ptrace;