| From ccc23d7e3153daa7f912d11a01e7da50848f2d70 Mon Sep 17 00:00:00 2001 |
| From: Dave Martin <Dave.Martin@arm.com> |
| Date: Mon, 27 Mar 2017 15:10:55 +0100 |
| Subject: [PATCH] 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/metag/kernel/ptrace.c b/arch/metag/kernel/ptrace.c |
| index 7563628822bd..ae659ba61948 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) |
| -- |
| 2.12.0 |
| |