um: fix sparse warnings from regset refactor
Subsystems (3)
PATCH 1/2 um: fix sparse warnings from regset refactor
From: Benjamin Berg <[email protected]>
Some variables were not tagged with __user and another was not marked as static even though it should be.
Reported-by kernel test robot <[email protected]>
Fixes 3f17fed21491 ("um: switch to regset API and depend on XSTATE")
Signed-off-by Benjamin Berg <[email protected]>
--- arch/x86/um/ptrace.c | 2 +- arch/x86/um/signal.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-)
arch/x86/um/ptrace.c +1 -1
@@ -242,7 +242,7 @@ static struct user_regset uml_regsets[] __ro_after_init = {/* TODO: Add TLS regset for 32bit */ }; -const struct user_regset_view user_uml_view = { +static const struct user_regset_view user_uml_view = { #ifdef CONFIG_X86_32 .name ="i386" , .e_machine =EM_386 , #else
arch/x86/um/signal.c +8 -5
@@ -82,9 +82,10 @@ static int copy_sc_from_user(struct pt_regs *regs,#undef GETREG#ifdef CONFIG_X86_32 - from_fp64 = ((void *)sc.fpstate) + offsetof(struct _fpstate_32 , _fxsr_env); + from_fp64 = ((void __user *)sc.fpstate) + + offsetof(struct _fpstate_32 , _fxsr_env);#else - from_fp64 = (void *)sc.fpstate; + from_fp64 = (void __user *)sc.fpstate;#endif err =copy_from_user (regs->regs.fp, from_fp64, host_fp_size);
@@ -97,7 +98,7 @@ static int copy_sc_from_user(struct pt_regs *regs,task_user_regset_view (current),REGSET_FP_LEGACY ,0 ,sizeof (struct user_i387_struct ), - (void *)sc.fpstate); + (void __user *)sc.fpstate);if (err <0 )return err;#endif
@@ -173,7 +174,8 @@ static int copy_sc_to_user(struct sigcontext __user *to,BUILD_BUG_ON (offsetof(struct _xstate , xstate_hdr) != offsetof(struct _xstate_64 , xstate_hdr) + offsetof(struct _fpstate_32 , _fxsr_env)); - to_fp64 = (void *)to_fp + offsetof(struct _fpstate_32 , _fxsr_env); + to_fp64 = (void __user *)to_fp + + offsetof(struct _fpstate_32 , _fxsr_env);#else to_fp64 = to_fp;#endif /* CONFIG_X86_32 */
@@ -198,7 +200,8 @@ static int copy_sc_to_user(struct sigcontext __user *to,__put_user (host_fp_size, &to_fp64->fpstate.sw_reserved.xstate_size);__put_user (FP_XSTATE_MAGIC1 , &to_fp64->fpstate.sw_reserved.magic1); -__put_user (FP_XSTATE_MAGIC2 , (int *)((void *)to_fp64 + host_fp_size)); +__put_user (FP_XSTATE_MAGIC2 , + (int __user *)((void __user *)to_fp64 + host_fp_size));return 0 ; }
Signature · 1 line
2.47.0
PATCH 2/2 um: fix sparse warnings in signal code
From: Benjamin Berg <[email protected]>
sparse reports that various places were missing the __user tag in casts. In addition, one location was using 0 instead of NULL.
Signed-off-by Benjamin Berg <[email protected]>
--- arch/x86/um/signal.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/x86/um/signal.c +6 -6
@@ -242,7 +242,7 @@ int setup_signal_stack_sc(unsigned long stack_top, struct ksignal *ksig,if (ksig->ka.sa.sa_flags &SA_RESTORER ) restorer = ksig->ka.sa.sa_restorer; - err |=__put_user (restorer, (void **)&frame->pretcode); + err |=__put_user (restorer, (void __user *__user *)&frame->pretcode); err |=__put_user (sig, &frame->sig); fp_to = (unsigned long )frame +sizeof (*frame);
@@ -298,10 +298,10 @@ int setup_signal_stack_si(unsigned long stack_top, struct ksignal *ksig,if (ksig->ka.sa.sa_flags &SA_RESTORER ) restorer = ksig->ka.sa.sa_restorer; - err |=__put_user (restorer, (void **)&frame->pretcode); + err |=__put_user (restorer, (void __user *__user *)&frame->pretcode); err |=__put_user (sig, &frame->sig); - err |=__put_user (&frame->info, (void **)&frame->pinfo); - err |=__put_user (&frame->uc, (void **)&frame->puc); + err |=__put_user (&frame->info, (void __user *__user *)&frame->pinfo); + err |=__put_user (&frame->uc, (void __user *__user *)&frame->puc); err |=copy_siginfo_to_user (&frame->info, &ksig->info); fp_to = (unsigned long )frame +sizeof (*frame);
@@ -387,7 +387,7 @@ int setup_signal_stack_si(unsigned long stack_top, struct ksignal *ksig,/* Create the ucontext. */ err |=__put_user (0 , &frame->uc.uc_flags); - err |=__put_user (0 , &frame->uc.uc_link); + err |=__put_user (NULL , &frame->uc.uc_link); err |=__save_altstack (&frame->uc.uc_stack,PT_REGS_SP (regs)); fp_to = (unsigned long )frame +sizeof (*frame);
@@ -411,7 +411,7 @@ int setup_signal_stack_si(unsigned long stack_top, struct ksignal *ksig,*/ /* x86-64 should always use SA_RESTORER. */ if (ksig->ka.sa.sa_flags &SA_RESTORER ) - err |=__put_user ((void *)ksig->ka.sa.sa_restorer, + err |=__put_user ((void __user *)ksig->ka.sa.sa_restorer, &frame->pretcode);else /* could use a vstub here */
Signature · 1 line
2.47.0