Commit 9a02fd8b authored by Lukas Bulwahn's avatar Lukas Bulwahn Committed by Borislav Petkov
Browse files

x86/ia32_signal: Propagate __user annotation properly 



Commit

  57d563c8 ("x86: ia32_setup_rt_frame(): consolidate uaccess areas")

dropped a __user annotation in a cast when refactoring __put_user() to
unsafe_put_user().

Hence, since then, sparse warns in arch/x86/ia32/ia32_signal.c:350:9:

  warning: cast removes address space '__user' of expression
  warning: incorrect type in argument 1 (different address spaces)
    expected void const volatile [noderef] __user *ptr
    got unsigned long long [usertype] *

Add the __user annotation to restore the propagation of address spaces.

Signed-off-by: default avatarLukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20201207124141.21859-1-lukas.bulwahn@gmail.com
parent 72ebb5ff

arch/x86/ia32/ia32_signal.c

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig, 
	 */

	unsafe_put_user(*((u64 *)&code), (u64 __user *)frame->retcode, Efault);

	unsafe_put_sigcontext32(&frame->uc.uc_mcontext, fp, regs, set, Efault);

	unsafe_put_user(*(__u64 *)set, (__u64 *)&frame->uc.uc_sigmask, Efault);

	unsafe_put_user(*(__u64 *)set, (__u64 __user *)&frame->uc.uc_sigmask, Efault);

	user_access_end();



	if (__copy_siginfo_to_user32(&frame->info, &ksig->info))