Skip to content

Commit c869366

Browse files
Dave Martingregkh
authored andcommitted
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>
1 parent e1dc890 commit c869366

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

arch/mips/kernel/ptrace.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,8 @@ static int fpr_set(struct task_struct *target,
485485
&target->thread.fpu,
486486
0, sizeof(elf_fpregset_t));
487487

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++) {
489490
err = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
490491
&fpr_val, i * sizeof(elf_fpreg_t),
491492
(i + 1) * sizeof(elf_fpreg_t));

0 commit comments

Comments
 (0)