Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933476AbdC3KQv (ORCPT ); Thu, 30 Mar 2017 06:16:51 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:56196 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933455AbdC3KQs (ORCPT ); Thu, 30 Mar 2017 06:16:48 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dave Martin , James Hogan , Linus Torvalds Subject: [PATCH 4.9 11/16] metag/ptrace: Preserve previous registers for short regset write Date: Thu, 30 Mar 2017 12:16:02 +0200 Message-Id: <20170330100432.007947490@linuxfoundation.org> X-Mailer: git-send-email 2.12.1 In-Reply-To: <20170330100431.550322562@linuxfoundation.org> References: <20170330100431.550322562@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 987 Lines: 32 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dave Martin commit a78ce80d2c9178351b34d78fec805140c29c193e 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 Acked-by: James Hogan Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- arch/metag/kernel/ptrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/arch/metag/kernel/ptrace.c +++ b/arch/metag/kernel/ptrace.c @@ -303,7 +303,7 @@ static int metag_tls_set(struct task_str const void *kbuf, const void __user *ubuf) { int ret; - void __user *tls; + void __user *tls = target->thread.tls_ptr; ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &tls, 0, -1); if (ret)