summaryrefslogtreecommitdiff
path: root/kernel/rseq.c
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2025-02-28 12:37:14 +0100
committerUlf Hansson <ulf.hansson@linaro.org>2025-02-28 12:37:14 +0100
commitc432bdcf39d52cbba7487d4ebfcf735cee59481e (patch)
tree5235fe21993c9fb04cbada15ed940961068258c3 /kernel/rseq.c
parent36ccabe59ddacefd79b7dfa4a66359385f22eed4 (diff)
parentd082ecbc71e9e0bf49883ee4afd435a77a5101b6 (diff)
downloadlwn-c432bdcf39d52cbba7487d4ebfcf735cee59481e.tar.gz
lwn-c432bdcf39d52cbba7487d4ebfcf735cee59481e.zip
pmdomain: Merge tag 'v6.14-rc4' from Linus into next
Linux 6.14-rc4
Diffstat (limited to 'kernel/rseq.c')
-rw-r--r--kernel/rseq.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/kernel/rseq.c b/kernel/rseq.c
index 442aba29bc4c..2cb16091ec0a 100644
--- a/kernel/rseq.c
+++ b/kernel/rseq.c
@@ -507,9 +507,6 @@ SYSCALL_DEFINE4(rseq, struct rseq __user *, rseq, u32, rseq_len,
return -EINVAL;
if (!access_ok(rseq, rseq_len))
return -EFAULT;
- current->rseq = rseq;
- current->rseq_len = rseq_len;
- current->rseq_sig = sig;
#ifdef CONFIG_DEBUG_RSEQ
/*
* Initialize the in-kernel rseq fields copy for validation of
@@ -522,6 +519,14 @@ SYSCALL_DEFINE4(rseq, struct rseq __user *, rseq, u32, rseq_len,
return -EFAULT;
#endif
/*
+ * Activate the registration by setting the rseq area address, length
+ * and signature in the task struct.
+ */
+ current->rseq = rseq;
+ current->rseq_len = rseq_len;
+ current->rseq_sig = sig;
+
+ /*
* If rseq was previously inactive, and has just been
* registered, ensure the cpu_id_start and cpu_id fields
* are updated before returning to user-space.