arm64/ptrace: Preserve previous registers for short regset write
authorDave Martin <Dave.Martin@arm.com>
Wed, 18 Jan 2017 16:25:22 +0000 (16:25 +0000)
committerCatalin Marinas <catalin.marinas@arm.com>
Wed, 18 Jan 2017 18:05:08 +0000 (18:05 +0000)
Ensure that if userspace supplies insufficient data to
PTRACE_SETREGSET to fill all the registers, the thread's old
registers are preserved.

Cc: <stable@vger.kernel.org> # 4.3.x-
Fixes: 5d220ff9420f ("arm64: Better native ptrace support for compat tasks")
Signed-off-by: Dave Martin <Dave.Martin@arm.com>
Acked-by: Will Deacon <Will.Deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
arch/arm64/kernel/ptrace.c

index ead36d5..91c4719 100644 (file)
@@ -950,7 +950,7 @@ static int compat_tls_set(struct task_struct *target,
                          const void __user *ubuf)
 {
        int ret;
-       compat_ulong_t tls;
+       compat_ulong_t tls = target->thread.tp_value;
 
        ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &tls, 0, -1);
        if (ret)