Skip to content

Commit 5274e6c

Browse files
Fenghua Yusuryasaimadhu
authored andcommitted
x86/fpu/xstate: Rename validate_xstate_header() to validate_user_xstate_header()
The function validate_xstate_header() validates an xstate header coming from userspace (PTRACE or sigreturn). To make it clear, rename it to validate_user_xstate_header(). Suggested-by: Dave Hansen <[email protected]> Signed-off-by: Fenghua Yu <[email protected]> Signed-off-by: Yu-cheng Yu <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Reviewed-by: Dave Hansen <[email protected]> Reviewed-by: Tony Luck <[email protected]> Reviewed-by: Borislav Petkov <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 2ef96a5 commit 5274e6c

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

arch/x86/include/asm/fpu/xstate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ int copy_kernel_to_xstate(struct xregs_state *xsave, const void *kbuf);
5656
int copy_user_to_xstate(struct xregs_state *xsave, const void __user *ubuf);
5757

5858
/* Validate an xstate header supplied by userspace (ptrace or sigreturn) */
59-
extern int validate_xstate_header(const struct xstate_header *hdr);
59+
int validate_user_xstate_header(const struct xstate_header *hdr);
6060

6161
#endif

arch/x86/kernel/fpu/regset.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ int xstateregs_set(struct task_struct *target, const struct user_regset *regset,
139139
} else {
140140
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, xsave, 0, -1);
141141
if (!ret)
142-
ret = validate_xstate_header(&xsave->header);
142+
ret = validate_user_xstate_header(&xsave->header);
143143
}
144144

145145
/*

arch/x86/kernel/fpu/signal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ static int __fpu__restore_sig(void __user *buf, void __user *buf_fx, int size)
366366
ret = __copy_from_user(&fpu->state.xsave, buf_fx, state_size);
367367

368368
if (!ret && state_size > offsetof(struct xregs_state, header))
369-
ret = validate_xstate_header(&fpu->state.xsave.header);
369+
ret = validate_user_xstate_header(&fpu->state.xsave.header);
370370
}
371371
if (ret)
372372
goto err_out;

arch/x86/kernel/fpu/xstate.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -472,7 +472,7 @@ int using_compacted_format(void)
472472
}
473473

474474
/* Validate an xstate header supplied by userspace (ptrace or sigreturn) */
475-
int validate_xstate_header(const struct xstate_header *hdr)
475+
int validate_user_xstate_header(const struct xstate_header *hdr)
476476
{
477477
/* No unknown or supervisor features may be set */
478478
if (hdr->xfeatures & (~xfeatures_mask | XFEATURE_MASK_SUPERVISOR))
@@ -1147,7 +1147,7 @@ int copy_kernel_to_xstate(struct xregs_state *xsave, const void *kbuf)
11471147

11481148
memcpy(&hdr, kbuf + offset, size);
11491149

1150-
if (validate_xstate_header(&hdr))
1150+
if (validate_user_xstate_header(&hdr))
11511151
return -EINVAL;
11521152

11531153
for (i = 0; i < XFEATURE_MAX; i++) {
@@ -1201,7 +1201,7 @@ int copy_user_to_xstate(struct xregs_state *xsave, const void __user *ubuf)
12011201
if (__copy_from_user(&hdr, ubuf + offset, size))
12021202
return -EFAULT;
12031203

1204-
if (validate_xstate_header(&hdr))
1204+
if (validate_user_xstate_header(&hdr))
12051205
return -EINVAL;
12061206

12071207
for (i = 0; i < XFEATURE_MAX; i++) {

0 commit comments

Comments
 (0)