From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:43192 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933321AbdC3ILv (ORCPT ); Thu, 30 Mar 2017 04:11:51 -0400 Subject: Patch "mips/ptrace: Preserve previous registers for short regset write" has been added to the 4.10-stable tree To: Dave.Martin@arm.com, gregkh@linuxfoundation.org, torvalds@linux-foundation.org Cc: , From: Date: Thu, 30 Mar 2017 10:11:12 +0200 Message-ID: <14908614711383@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled mips/ptrace: Preserve previous registers for short regset write to the 4.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: mips-ptrace-preserve-previous-registers-for-short-regset-write.patch and it can be found in the queue-4.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From d614fd58a2834cfe4efa472c33c8f3ce2338b09b Mon Sep 17 00:00:00 2001 From: Dave Martin Date: Mon, 27 Mar 2017 15:10:58 +0100 Subject: mips/ptrace: Preserve previous registers for short regset write From: Dave Martin 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 Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- arch/mips/kernel/ptrace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/arch/mips/kernel/ptrace.c +++ b/arch/mips/kernel/ptrace.c @@ -485,7 +485,8 @@ static int fpr_set(struct task_struct *t &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)); Patches currently in stable-queue which might be from Dave.Martin@arm.com are queue-4.10/metag-ptrace-reject-partial-nt_metag_rpipe-writes.patch queue-4.10/metag-ptrace-preserve-previous-registers-for-short-regset-write.patch queue-4.10/metag-ptrace-provide-default-txstatus-for-short-nt_prstatus.patch queue-4.10/c6x-ptrace-remove-useless-ptrace_setregset-implementation.patch queue-4.10/mips-ptrace-preserve-previous-registers-for-short-regset-write.patch queue-4.10/h8300-ptrace-fix-incorrect-register-transfer-count.patch queue-4.10/sparc-ptrace-preserve-previous-registers-for-short-regset-write.patch