Commit 5a695127 authored by Benjamin Berg's avatar Benjamin Berg Committed by Johannes Berg
Browse files

um: always use the internal copy of the FP registers 



When switching from userspace to the kernel, all registers including the
FP registers are copied into the kernel and restored later on. As such,
the true source for the FP register state is actually already in the
kernel and they should never be grabbed from the userspace process.

Change the various places to simply copy the data from the internal FP
register storage area. Note that on i386 the format of PTRACE_GETFPREGS
and PTRACE_GETFPXREGS is different enough that conversion would be
needed. With this patch, -EINVAL is returned if the non-native format is
requested.

The upside is, that this patchset fixes setting registers via ptrace
(which simply did not work before) as well as fixing setting floating
point registers using the mcontext on signal return on i386.

Signed-off-by: default avatarBenjamin Berg <benjamin.berg@intel.com>
Link: https://patch.msgid.link/20240913133845.964292-1-benjamin@sipsolutions.net


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 865e3845

arch/um/include/shared/registers.h

+0 −6
Original line number Diff line number Diff line
@@ -8,12 +8,6 @@ 


#include <sysdep/ptrace.h>



extern int save_i387_registers(int pid, unsigned long *fp_regs);

extern int restore_i387_registers(int pid, unsigned long *fp_regs);

extern int save_fp_registers(int pid, unsigned long *fp_regs);

extern int restore_fp_registers(int pid, unsigned long *fp_regs);

extern int save_fpx_registers(int pid, unsigned long *fp_regs);

extern int restore_fpx_registers(int pid, unsigned long *fp_regs);

extern int init_pid_registers(int pid);

extern void get_safe_registers(unsigned long *regs, unsigned long *fp_regs);

extern int get_fp_registers(int pid, unsigned long *regs);

arch/um/kernel/process.c

+9 −2
Original line number Diff line number Diff line
@@ -290,8 +290,15 @@ unsigned long __get_wchan(struct task_struct *p) 


int elf_core_copy_task_fpregs(struct task_struct *t, elf_fpregset_t *fpu)

{

	int cpu = current_thread_info()->cpu;

#ifdef CONFIG_X86_32

	extern int have_fpx_regs;



	return save_i387_registers(userspace_pid[cpu], (unsigned long *) fpu) == 0;

	/* FIXME: A plain copy does not work on i386 with have_fpx_regs */

	if (have_fpx_regs)

		return 0;

#endif

	memcpy(fpu, &t->thread.regs.regs.fp, sizeof(*fpu));



	return 1;

}

arch/x86/um/os-Linux/registers.c

+6 −6
Original line number Diff line number Diff line
@@ -19,14 +19,14 @@ 


static int have_xstate_support;



int save_i387_registers(int pid, unsigned long *fp_regs)

static int save_i387_registers(int pid, unsigned long *fp_regs)

{

	if (ptrace(PTRACE_GETFPREGS, pid, 0, fp_regs) < 0)

		return -errno;

	return 0;

}



int save_fp_registers(int pid, unsigned long *fp_regs)

static int save_fp_registers(int pid, unsigned long *fp_regs)

{

#ifdef PTRACE_GETREGSET

	struct iovec iov;
@@ -42,14 +42,14 @@ int save_fp_registers(int pid, unsigned long *fp_regs) 
		return save_i387_registers(pid, fp_regs);

}



int restore_i387_registers(int pid, unsigned long *fp_regs)

static int restore_i387_registers(int pid, unsigned long *fp_regs)

{

	if (ptrace(PTRACE_SETFPREGS, pid, 0, fp_regs) < 0)

		return -errno;

	return 0;

}



int restore_fp_registers(int pid, unsigned long *fp_regs)

static int restore_fp_registers(int pid, unsigned long *fp_regs)

{

#ifdef PTRACE_SETREGSET

	struct iovec iov;
@@ -66,14 +66,14 @@ int restore_fp_registers(int pid, unsigned long *fp_regs) 


#ifdef __i386__

int have_fpx_regs = 1;

int save_fpx_registers(int pid, unsigned long *fp_regs)

static int save_fpx_registers(int pid, unsigned long *fp_regs)

{

	if (ptrace(PTRACE_GETFPXREGS, pid, 0, fp_regs) < 0)

		return -errno;

	return 0;

}



int restore_fpx_registers(int pid, unsigned long *fp_regs)

static int restore_fpx_registers(int pid, unsigned long *fp_regs)

{

	if (ptrace(PTRACE_SETFPXREGS, pid, 0, fp_regs) < 0)

		return -errno;

arch/x86/um/ptrace_32.c

+27 −23
Original line number Diff line number Diff line
@@ -168,17 +168,18 @@ int peek_user(struct task_struct *child, long addr, long data) 
	return put_user(tmp, (unsigned long __user *) data);

}



/* FIXME: Do the required conversions instead of erroring out */

extern int have_fpx_regs;



static int get_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)

{

	int err, n, cpu = task_cpu(child);

	struct user_i387_struct fpregs;

	int n;



	err = save_i387_registers(userspace_pid[cpu],

				  (unsigned long *) &fpregs);

	if (err)

		return err;

	if (have_fpx_regs)

		return -EINVAL;



	n = copy_to_user(buf, &fpregs, sizeof(fpregs));

	n = copy_to_user(buf, &child->thread.regs.regs.fp,

			 sizeof(struct user_i387_struct));

	if(n > 0)

		return -EFAULT;
@@ -187,27 +188,28 @@ static int get_fpregs(struct user_i387_struct __user *buf, struct task_struct *c 


static int set_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)

{

	int n, cpu = task_cpu(child);

	struct user_i387_struct fpregs;

	int n;



	if (have_fpx_regs)

		return -EINVAL;



	n = copy_from_user(&fpregs, buf, sizeof(fpregs));

	n = copy_from_user(&child->thread.regs.regs.fp, buf,

			   sizeof(struct user_i387_struct));

	if (n > 0)

		return -EFAULT;



	return restore_i387_registers(userspace_pid[cpu],

				    (unsigned long *) &fpregs);

	return 0;

}



static int get_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct *child)

{

	int err, n, cpu = task_cpu(child);

	struct user_fxsr_struct fpregs;

	int n;



	err = save_fpx_registers(userspace_pid[cpu], (unsigned long *) &fpregs);

	if (err)

		return err;

	if (!have_fpx_regs)

		return -EINVAL;



	n = copy_to_user(buf, &fpregs, sizeof(fpregs));

	n = copy_to_user(buf, &child->thread.regs.regs.fp,

			 sizeof(struct user_fxsr_struct));

	if(n > 0)

		return -EFAULT;
@@ -216,15 +218,17 @@ static int get_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct * 


static int set_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct *child)

{

	int n, cpu = task_cpu(child);

	struct user_fxsr_struct fpregs;

	int n;



	n = copy_from_user(&fpregs, buf, sizeof(fpregs));

	if (!have_fpx_regs)

		return -EINVAL;



	n = copy_from_user(&child->thread.regs.regs.fp, buf,

			   sizeof(struct user_fxsr_struct));

	if (n > 0)

		return -EFAULT;



	return restore_fpx_registers(userspace_pid[cpu],

				     (unsigned long *) &fpregs);

	return 0;

}



long subarch_ptrace(struct task_struct *child, long request,

arch/x86/um/ptrace_64.c

+7 −13
Original line number Diff line number Diff line
@@ -190,15 +190,10 @@ int peek_user(struct task_struct *child, long addr, long data) 


static int get_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)

{

	int err, n, cpu = ((struct thread_info *) child->stack)->cpu;

	struct user_i387_struct fpregs;

	int n;



	err = save_i387_registers(userspace_pid[cpu],

				  (unsigned long *) &fpregs);

	if (err)

		return err;



	n = copy_to_user(buf, &fpregs, sizeof(fpregs));

	n = copy_to_user(buf, &child->thread.regs.regs.fp,

			 sizeof(struct user_i387_struct));

	if (n > 0)

		return -EFAULT;
@@ -207,15 +202,14 @@ static int get_fpregs(struct user_i387_struct __user *buf, struct task_struct *c 


static int set_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)

{

	int n, cpu = ((struct thread_info *) child->stack)->cpu;

	struct user_i387_struct fpregs;

	int n;



	n = copy_from_user(&fpregs, buf, sizeof(fpregs));

	n = copy_from_user(&child->thread.regs.regs.fp, buf,

			   sizeof(struct user_i387_struct));

	if (n > 0)

		return -EFAULT;



	return restore_i387_registers(userspace_pid[cpu],

				      (unsigned long *) &fpregs);

	return 0;

}



long subarch_ptrace(struct task_struct *child, long request,