x86: x32_setup_rt_frame(): consolidate uaccess areas (791612e9) · Commits · 戴 / test

arch/x86/kernel/signal.c

+5 −12

Original line number	Diff line number	Diff line
		@@ -517,7 +517,6 @@ static int x32_setup_rt_frame(struct ksignal *ksig,
		struct rt_sigframe_x32 __user *frame;
		unsigned long uc_flags;
		void __user *restorer;
		int err = 0;
		void __user *fp = NULL;

		if (!(ksig->ka.sa.sa_flags & SA_RESTORER))
		@@ -525,14 +524,6 @@ static int x32_setup_rt_frame(struct ksignal *ksig,

		frame = get_sigframe(&ksig->ka, regs, sizeof(*frame), &fp);

		if (!access_ok(frame, sizeof(*frame)))
		return -EFAULT;

		if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
		if (__copy_siginfo_to_user32(&frame->info, &ksig->info, true))
		return -EFAULT;
		}

		uc_flags = frame_uc_flags(regs);

		if (!user_access_begin(frame, sizeof(*frame)))
		@@ -546,11 +537,13 @@ static int x32_setup_rt_frame(struct ksignal *ksig,
		restorer = ksig->ka.sa.sa_restorer;
		unsafe_put_user(restorer, (unsigned long __user *)&frame->pretcode, Efault);
		unsafe_put_sigcontext(&frame->uc.uc_mcontext, fp, regs, set, Efault);
		unsafe_put_user((__u64 )set, (__u64 __user *)&frame->uc.uc_sigmask, Efault);
		user_access_end();
		err \|= __put_user((__u64 )set, (__u64 __user *)&frame->uc.uc_sigmask);

		if (err)
		if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
		if (__copy_siginfo_to_user32(&frame->info, &ksig->info, true))
		return -EFAULT;
		}

		/* Set up registers for signal handler */
		regs->sp = (unsigned long) frame;