Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

a4685d2f · Linus Torvalds <[email protected]> · 2017-01-23 13:51:59 -08:00

Pull tile bugfix from Chris Metcalf:
 "This avoids an issue with short userspace reads for regset via ptrace"

* 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
  tile/ptrace: Preserve previous registers for short regset write

Commit: a4685d2f58e2230d4e27fb2ee581d7ea35e5d046
Parents: 63021182 · fd7c9914

Merge commit. Changes below are compared with the first parent: 63021182.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
arch/tile/kernel/ptrace.c	modified	+1	−1	View file

arch/tile/kernel/ptrace.c

View file

diff --git a/arch/tile/kernel/ptrace.c b/arch/tile/kernel/ptrace.c
index d89b701..e279572 100644
--- a/arch/tile/kernel/ptrace.c
+++ b/arch/tile/kernel/ptrace.c
@@ -111,7 +111,7 @@ static int tile_gpr_set(struct task_struct *target,
 			  const void *kbuf, const void __user *ubuf)
 {
 	int ret;
-	struct pt_regs regs;
+	struct pt_regs regs = *task_pt_regs(target);
 
 	ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &regs, 0,
 				 sizeof(regs));