aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Martin <Dave.Martin@arm.com>2017-03-27 15:10:55 +0100
committerMister Oyster <oysterized@gmail.com>2017-07-04 12:11:12 +0200
commitd3bbefb6207a8d20bbf62975ebb0d9b97246de81 (patch)
treef273ec986c344cf0918ce7e6c3cabf311d979f74
parent4730ff4ab196c63d94aff3de05c75c1759ca5aa3 (diff)
metag/ptrace: Preserve previous registers for short regset write
commit a78ce80d2c9178351b34d78fec805140c29c193e upstream. Ensure that if userspace supplies insufficient data to PTRACE_SETREGSET to fill all the registers, the thread's old registers are preserved. Signed-off-by: Dave Martin <Dave.Martin@arm.com> Acked-by: James Hogan <james.hogan@imgtec.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Willy Tarreau <w@1wt.eu>
-rw-r--r--arch/metag/kernel/ptrace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/metag/kernel/ptrace.c b/arch/metag/kernel/ptrace.c
index 756362882..ae659ba61 100644
--- a/arch/metag/kernel/ptrace.c
+++ b/arch/metag/kernel/ptrace.c
@@ -303,7 +303,7 @@ static int metag_tls_set(struct task_struct *target,
const void *kbuf, const void __user *ubuf)
{
int ret;
- void __user *tls;
+ void __user *tls = target->thread.tls_ptr;
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &tls, 0, -1);
if (ret)