[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20210611163112.757056621@linutronix.de>
Date: Fri, 11 Jun 2021 18:15:40 +0200
From: Thomas Gleixner <tglx@...utronix.de>
To: LKML <linux-kernel@...r.kernel.org>
Cc: Andy Lutomirski <luto@...nel.org>,
Dave Hansen <dave.hansen@...ux.intel.com>,
Fenghua Yu <fenghua.yu@...el.com>,
Tony Luck <tony.luck@...el.com>,
Yu-cheng Yu <yu-cheng.yu@...el.com>,
Sebastian Andrzej Siewior <bigeasy@...utronix.de>,
Borislav Petkov <bp@...e.de>,
Peter Zijlstra <peterz@...radead.org>,
Kan Liang <kan.liang@...ux.intel.com>
Subject: [patch 17/41] x86/fpu: Deduplicate copy_uabi_from_user/kernel_to_xstate()
copy_uabi_from_user_to_xstate() and copy_uabi_from_kernel_to_xstate() are
almost identical except for the copy function.
Unify them.
Signed-off-by: Thomas Gleixner <tglx@...utronix.de>
Acked-by: Andy Lutomirski <luto@...nel.org>
---
V4: Adjusted to the rename.
---
arch/x86/kernel/fpu/xstate.c | 84 +++++++++++++++----------------------------
1 file changed, 30 insertions(+), 54 deletions(-)
--- a/arch/x86/kernel/fpu/xstate.c
+++ b/arch/x86/kernel/fpu/xstate.c
@@ -1020,20 +1020,30 @@ void copy_uabi_xstate_to_membuf(struct m
fill_gap(&to, &last, size);
}
-/*
- * Convert from a ptrace standard-format kernel buffer to kernel XSAVE[S] format
- * and copy to the target thread. This is called from xstateregs_set().
- */
-int copy_uabi_from_kernel_to_xstate(struct xregs_state *xsave, const void *kbuf)
+static int copy_from_buffer(void *dst, unsigned int offset, unsigned int size,
+ const void *kbuf, const void __user *ubuf)
+{
+ if (kbuf) {
+ memcpy(dst, kbuf + offset, size);
+ } else {
+ if (copy_from_user(dst, ubuf + offset, size))
+ return -EFAULT;
+ }
+ return 0;
+}
+
+static int copy_uabi_to_xstate(struct xregs_state *xsave, const void *kbuf,
+ const void __user *ubuf)
{
unsigned int offset, size;
- int i;
struct xstate_header hdr;
+ int i;
offset = offsetof(struct xregs_state, header);
size = sizeof(hdr);
- memcpy(&hdr, kbuf + offset, size);
+ if (copy_from_buffer(&hdr, offset, size, kbuf, ubuf))
+ return -EFAULT;
if (validate_user_xstate_header(&hdr))
return -EINVAL;
@@ -1047,7 +1057,8 @@ int copy_uabi_from_kernel_to_xstate(stru
offset = xstate_offsets[i];
size = xstate_sizes[i];
- memcpy(dst, kbuf + offset, size);
+ if (copy_from_buffer(dst, offset, size, kbuf, ubuf))
+ return -EFAULT;
}
}
@@ -1075,6 +1086,16 @@ int copy_uabi_from_kernel_to_xstate(stru
}
/*
+ * Convert from a ptrace standard-format kernel buffer to kernel XSAVE[S]
+ * format and copy to the target thread. This is called from
+ * xstateregs_set().
+ */
+int copy_uabi_from_kernel_to_xstate(struct xregs_state *xsave, const void *kbuf)
+{
+ return copy_uabi_to_xstate(xsave, kbuf, NULL);
+}
+
+/*
* Convert from a sigreturn standard-format user-space buffer to kernel
* XSAVE[S] format and copy to the target thread. This is called from the
* sigreturn() and rt_sigreturn() system calls.
@@ -1082,52 +1103,7 @@ int copy_uabi_from_kernel_to_xstate(stru
int copy_sigframe_from_user_to_xstate(struct xregs_state *xsave,
const void __user *ubuf)
{
- unsigned int offset, size;
- int i;
- struct xstate_header hdr;
-
- offset = offsetof(struct xregs_state, header);
- size = sizeof(hdr);
-
- if (copy_from_user(&hdr, ubuf + offset, size))
- return -EFAULT;
-
- if (validate_user_xstate_header(&hdr))
- return -EINVAL;
-
- for (i = 0; i < XFEATURE_MAX; i++) {
- u64 mask = ((u64)1 << i);
-
- if (hdr.xfeatures & mask) {
- void *dst = __raw_xsave_addr(xsave, i);
-
- offset = xstate_offsets[i];
- size = xstate_sizes[i];
-
- if (copy_from_user(dst, ubuf + offset, size))
- return -EFAULT;
- }
- }
-
- if (xfeatures_mxcsr_quirk(hdr.xfeatures)) {
- offset = offsetof(struct fxregs_state, mxcsr);
- size = MXCSR_AND_FLAGS_SIZE;
- if (copy_from_user(&xsave->i387.mxcsr, ubuf + offset, size))
- return -EFAULT;
- }
-
- /*
- * The state that came in from userspace was user-state only.
- * Mask all the user states out of 'xfeatures':
- */
- xsave->header.xfeatures &= XFEATURE_MASK_SUPERVISOR_ALL;
-
- /*
- * Add back in the features that came in from userspace:
- */
- xsave->header.xfeatures |= hdr.xfeatures;
-
- return 0;
+ return copy_uabi_to_xstate(xsave, NULL, ubuf);
}
/**
Powered by blists - more mailing lists