Merge tag 'hwlock-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson...

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

diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 821cf17..76f0945 100644 (file)
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -31,6 +31,7 @@
 #include <linux/cn_proc.h>
 #include <linux/compat.h>
 #include <linux/sched/signal.h>
+#include <linux/minmax.h>
 
 #include <asm/syscall.h>       /* for syscall_get_* */
 
@@ -375,7 +376,7 @@ static int ptrace_attach(struct task_struct *task, long request,
        audit_ptrace(task);
 
        retval = -EPERM;
-       if (unlikely(task->flags & (PF_KTHREAD | PF_IO_WORKER)))
+       if (unlikely(task->flags & PF_KTHREAD))
                goto out;
        if (same_thread_group(task, current))
                goto out;
@@ -779,6 +780,24 @@ static int ptrace_peek_siginfo(struct task_struct *child,
        return ret;
 }
 
+#ifdef CONFIG_RSEQ
+static long ptrace_get_rseq_configuration(struct task_struct *task,
+                                         unsigned long size, void __user *data)
+{
+       struct ptrace_rseq_configuration conf = {
+               .rseq_abi_pointer = (u64)(uintptr_t)task->rseq,
+               .rseq_abi_size = sizeof(*task->rseq),
+               .signature = task->rseq_sig,
+               .flags = 0,
+       };
+
+       size = min_t(unsigned long, size, sizeof(conf));
+       if (copy_to_user(data, &conf, size))
+               return -EFAULT;
+       return sizeof(conf);
+}
+#endif
+
 #ifdef PTRACE_SINGLESTEP
 #define is_singlestep(request)         ((request) == PTRACE_SINGLESTEP)
 #else
@@ -1222,6 +1241,12 @@ int ptrace_request(struct task_struct *child, long request,
                ret = seccomp_get_metadata(child, addr, datavp);
                break;
 
+#ifdef CONFIG_RSEQ
+       case PTRACE_GET_RSEQ_CONFIGURATION:
+               ret = ptrace_get_rseq_configuration(child, addr, datavp);
+               break;
+#endif
+
        default:
                break;
        }