Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ffc51be8 authored by Al Viro's avatar Al Viro
Browse files

um: missing checks of __put_user()/__get_user() return values 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 0088b6ec

arch/x86/um/signal.c

+2 −2
Original line number Diff line number Diff line
@@ -544,8 +544,8 @@ int setup_signal_stack_si(unsigned long stack_top, int sig, 
			       set->sig[0]);

	err |= __put_user(&frame->fpstate, &frame->uc.uc_mcontext.fpstate);

	if (sizeof(*set) == 16) {

		__put_user(set->sig[0], &frame->uc.uc_sigmask.sig[0]);

		__put_user(set->sig[1], &frame->uc.uc_sigmask.sig[1]);

		err |= __put_user(set->sig[0], &frame->uc.uc_sigmask.sig[0]);

		err |= __put_user(set->sig[1], &frame->uc.uc_sigmask.sig[1]);

	}

	else

		err |= __copy_to_user(&frame->uc.uc_sigmask, set,

arch/x86/um/syscalls_32.c

+6 −6
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ long sys_sigaction(int sig, const struct old_sigaction __user *act, 
		old_sigset_t mask;

		if (!access_ok(VERIFY_READ, act, sizeof(*act)) ||

		    __get_user(new_ka.sa.sa_handler, &act->sa_handler) ||

		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer))

		    __get_user(new_ka.sa.sa_restorer, &act->sa_restorer) ||

		    __get_user(new_ka.sa.sa_flags, &act->sa_flags) ||

		    __get_user(mask, &act->sa_mask))

			return -EFAULT;

		__get_user(new_ka.sa.sa_flags, &act->sa_flags);

		__get_user(mask, &act->sa_mask);

		siginitset(&new_ka.sa.sa_mask, mask);

	}
@@ -56,10 +56,10 @@ long sys_sigaction(int sig, const struct old_sigaction __user *act, 
	if (!ret && oact) {

		if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) ||

		    __put_user(old_ka.sa.sa_handler, &oact->sa_handler) ||

		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer))

		    __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer) ||

		    __put_user(old_ka.sa.sa_flags, &oact->sa_flags) ||

		    __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask))

			return -EFAULT;

		__put_user(old_ka.sa.sa_flags, &oact->sa_flags);

		__put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask);

	}



	return ret;