diff options
| author | Dave Martin <Dave.Martin@arm.com> | 2017-03-27 10:10:58 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-03-31 04:31:46 -0400 |
| commit | 0ba34c87f7ce04232295ebf4991cd3ff36ea5abd (patch) | |
| tree | 2e0912f099dbb69fcfcf3b489bf765de83a9e22d /arch/mips/kernel | |
| parent | 616fe993f410c589cd928dfb015ccaf9c931dcc1 (diff) | |
mips/ptrace: Preserve previous registers for short regset write
commit d614fd58a2834cfe4efa472c33c8f3ce2338b09b 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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/ptrace.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c index a92994d60e91..bf83dc1eecfb 100644 --- a/arch/mips/kernel/ptrace.c +++ b/arch/mips/kernel/ptrace.c | |||
| @@ -485,7 +485,8 @@ static int fpr_set(struct task_struct *target, | |||
| 485 | &target->thread.fpu, | 485 | &target->thread.fpu, |
| 486 | 0, sizeof(elf_fpregset_t)); | 486 | 0, sizeof(elf_fpregset_t)); |
| 487 | 487 | ||
| 488 | for (i = 0; i < NUM_FPU_REGS; i++) { | 488 | BUILD_BUG_ON(sizeof(fpr_val) != sizeof(elf_fpreg_t)); |
| 489 | for (i = 0; i < NUM_FPU_REGS && count >= sizeof(elf_fpreg_t); i++) { | ||
| 489 | err = user_regset_copyin(&pos, &count, &kbuf, &ubuf, | 490 | err = user_regset_copyin(&pos, &count, &kbuf, &ubuf, |
| 490 | &fpr_val, i * sizeof(elf_fpreg_t), | 491 | &fpr_val, i * sizeof(elf_fpreg_t), |
| 491 | (i + 1) * sizeof(elf_fpreg_t)); | 492 | (i + 1) * sizeof(elf_fpreg_t)); |
