diff options
| author | Dave Martin | 2017-03-27 16:10:58 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2017-03-29 17:54:17 +0200 |
| commit | d614fd58a2834cfe4efa472c33c8f3ce2338b09b (patch) | |
| tree | deec6900fdc5a75b61feafa6dd82e33af6318f51 | |
| parent | metag/ptrace: Reject partial NT_METAG_RPIPE writes (diff) | |
| download | kernel-qcow2-linux-d614fd58a2834cfe4efa472c33c8f3ce2338b09b.tar.gz kernel-qcow2-linux-d614fd58a2834cfe4efa472c33c8f3ce2338b09b.tar.xz kernel-qcow2-linux-d614fd58a2834cfe4efa472c33c8f3ce2338b09b.zip | |
mips/ptrace: Preserve previous registers for short regset write
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>
| -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 c8ba26072132..5d2498eb2340 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, &target->thread.fpu, 0, sizeof(elf_fpregset_t)); - for (i = 0; i < NUM_FPU_REGS; i++) { + BUILD_BUG_ON(sizeof(fpr_val) != sizeof(elf_fpreg_t)); + for (i = 0; i < NUM_FPU_REGS && count >= sizeof(elf_fpreg_t); i++) { err = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &fpr_val, i * sizeof(elf_fpreg_t), (i + 1) * sizeof(elf_fpreg_t)); |