Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45fdc3a7 authored Jun 30, 2008 by Roland McGrath Committed by Ingo Molnar Jul 01, 2008

x86 ptrace: fix PTRACE_GETFPXREGS error



ptrace has always returned only -EIO for all failures to access
registers.  The user_regset calls are allowed to return a more
meaningful variety of errors.  The REGSET_XFP calls use -ENODEV
for !cpu_has_fxsr hardware.  Make ptrace return the traditional
-EIO instead of the error code from the user_regset call.

Signed-off-by: Roland McGrath <roland@redhat.com>
Cc: stable@kernel.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>

parent e1441b9a

arch/x86/kernel/i387.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -162,7 +162,7 @@ int xfpregs_get(struct task_struct target, const struct user_regset regset,
	int ret;		int ret;

	if (!cpu_has_fxsr)		if (!cpu_has_fxsr)
	return -EIO;		return -ENODEV;

	ret = init_fpu(target);		ret = init_fpu(target);
	if (ret)		if (ret)
	@@ -179,7 +179,7 @@ int xfpregs_set(struct task_struct target, const struct user_regset regset,
	int ret;		int ret;

	if (!cpu_has_fxsr)		if (!cpu_has_fxsr)
	return -EIO;		return -ENODEV;

	ret = init_fpu(target);		ret = init_fpu(target);
	if (ret)		if (ret)

arch/x86/kernel/ptrace.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -943,13 +943,13 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
	return copy_regset_to_user(child, &user_x86_32_view,		return copy_regset_to_user(child, &user_x86_32_view,
	REGSET_XFP,		REGSET_XFP,
	0, sizeof(struct user_fxsr_struct),		0, sizeof(struct user_fxsr_struct),
	datap);		datap) ? -EIO : 0;

	case PTRACE_SETFPXREGS: /* Set the child extended FPU state. */		case PTRACE_SETFPXREGS: /* Set the child extended FPU state. */
	return copy_regset_from_user(child, &user_x86_32_view,		return copy_regset_from_user(child, &user_x86_32_view,
	REGSET_XFP,		REGSET_XFP,
	0, sizeof(struct user_fxsr_struct),		0, sizeof(struct user_fxsr_struct),
	datap);		datap) ? -EIO : 0;
	#endif		#endif

	#if defined CONFIG_X86_32 \|\| defined CONFIG_IA32_EMULATION		#if defined CONFIG_X86_32 \|\| defined CONFIG_IA32_EMULATION