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

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

Linus Torvalds committed 9 years ago

Commit a4685d22 parents 6302118 fd7c9911 file · +1 −1Browse files

Unified · Split

arch/tile/kernel/ptrace.c+1−1

@@ -111,7 +111,7 @@ static int tile_gpr_set(struct task_struct *target, · 110 unmodified lines
111	const void kbuf, const void __user ubuf)	111	const void kbuf, const void __user ubuf)
112	{	112	{
113	int ret;	113	int ret;
114	struct pt_regs regs;	114	struct pt_regs regs = *task_pt_regs(target);
115		115
116	ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &regs, 0,	116	ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &regs, 0,
117	sizeof(regs));	117	sizeof(regs));