|
@@ -1142,8 +1142,7 @@ int copy_kernel_to_xstate(const void *kbuf, struct xregs_state *xsave)
|
|
|
* there we check the CPU has XSAVES and a whole standard-sized buffer
|
|
|
* exists.
|
|
|
*/
|
|
|
-int copy_user_to_xstate(const void *kbuf, const void __user *ubuf,
|
|
|
- struct xregs_state *xsave)
|
|
|
+int copy_user_to_xstate(const void __user *ubuf, struct xregs_state *xsave)
|
|
|
{
|
|
|
unsigned int offset, size;
|
|
|
int i;
|
|
@@ -1153,12 +1152,8 @@ int copy_user_to_xstate(const void *kbuf, const void __user *ubuf,
|
|
|
offset = offsetof(struct xregs_state, header);
|
|
|
size = sizeof(xfeatures);
|
|
|
|
|
|
- if (kbuf) {
|
|
|
- memcpy(&xfeatures, kbuf + offset, size);
|
|
|
- } else {
|
|
|
- if (__copy_from_user(&xfeatures, ubuf + offset, size))
|
|
|
- return -EFAULT;
|
|
|
- }
|
|
|
+ if (__copy_from_user(&xfeatures, ubuf + offset, size))
|
|
|
+ return -EFAULT;
|
|
|
|
|
|
/*
|
|
|
* Reject if the user sets any disabled or supervisor features:
|
|
@@ -1177,12 +1172,8 @@ int copy_user_to_xstate(const void *kbuf, const void __user *ubuf,
|
|
|
offset = xstate_offsets[i];
|
|
|
size = xstate_sizes[i];
|
|
|
|
|
|
- if (kbuf) {
|
|
|
- memcpy(dst, kbuf + offset, size);
|
|
|
- } else {
|
|
|
- if (__copy_from_user(dst, ubuf + offset, size))
|
|
|
- return -EFAULT;
|
|
|
- }
|
|
|
+ if (__copy_from_user(dst, ubuf + offset, size))
|
|
|
+ return -EFAULT;
|
|
|
}
|
|
|
}
|
|
|
|