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

Commit 3968cf62 authored by Al Viro's avatar Al Viro
Browse files

get_compat_sigset() 



similar to put_compat_sigset()

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

arch/sparc/kernel/sys_sparc32.c

+1 −3
Original line number Diff line number Diff line
@@ -166,13 +166,11 @@ COMPAT_SYSCALL_DEFINE5(rt_sigaction, int, sig, 


        if (act) {

		u32 u_handler, u_restorer;

		compat_sigset_t set32;



		new_ka.ka_restorer = restorer;

		ret = get_user(u_handler, &act->sa_handler);

		new_ka.sa.sa_handler =  compat_ptr(u_handler);

		ret |= copy_from_user(&set32, &act->sa_mask, sizeof(compat_sigset_t));

		sigset_from_compat(&new_ka.sa.sa_mask, &set32);

		ret |= get_compat_sigset(&new_ka.sa.sa_mask, &act->sa_mask);

		ret |= get_user(new_ka.sa.sa_flags, &act->sa_flags);

		ret |= get_user(u_restorer, &act->sa_restorer);

		new_ka.sa.sa_restorer = compat_ptr(u_restorer);

fs/eventpoll.c

+1 −3
Original line number Diff line number Diff line
@@ -2259,7 +2259,6 @@ COMPAT_SYSCALL_DEFINE6(epoll_pwait, int, epfd, 
			compat_size_t, sigsetsize)

{

	long err;

	compat_sigset_t csigmask;

	sigset_t ksigmask, sigsaved;



	/*
@@ -2269,9 +2268,8 @@ COMPAT_SYSCALL_DEFINE6(epoll_pwait, int, epfd, 
	if (sigmask) {

		if (sigsetsize != sizeof(compat_sigset_t))

			return -EINVAL;

		if (copy_from_user(&csigmask, sigmask, sizeof(csigmask)))

		if (get_compat_sigset(&ksigmask, sigmask))

			return -EFAULT;

		sigset_from_compat(&ksigmask, &csigmask);

		sigsaved = current->blocked;

		set_current_blocked(&ksigmask);

	}

fs/select.c

+2 −6
Original line number Diff line number Diff line
@@ -1301,7 +1301,6 @@ static long do_compat_pselect(int n, compat_ulong_t __user *inp, 
	struct compat_timespec __user *tsp, compat_sigset_t __user *sigmask,

	compat_size_t sigsetsize)

{

	compat_sigset_t ss32;

	sigset_t ksigmask, sigsaved;

	struct timespec64 ts, end_time, *to = NULL;

	int ret;
@@ -1318,9 +1317,8 @@ static long do_compat_pselect(int n, compat_ulong_t __user *inp, 
	if (sigmask) {

		if (sigsetsize != sizeof(compat_sigset_t))

			return -EINVAL;

		if (copy_from_user(&ss32, sigmask, sizeof(ss32)))

		if (get_compat_sigset(&ksigmask, sigmask))

			return -EFAULT;

		sigset_from_compat(&ksigmask, &ss32);



		sigdelsetmask(&ksigmask, sigmask(SIGKILL)|sigmask(SIGSTOP));

		sigprocmask(SIG_SETMASK, &ksigmask, &sigsaved);
@@ -1369,7 +1367,6 @@ COMPAT_SYSCALL_DEFINE5(ppoll, struct pollfd __user *, ufds, 
	unsigned int,  nfds, struct compat_timespec __user *, tsp,

	const compat_sigset_t __user *, sigmask, compat_size_t, sigsetsize)

{

	compat_sigset_t ss32;

	sigset_t ksigmask, sigsaved;

	struct timespec64 ts, end_time, *to = NULL;

	int ret;
@@ -1386,9 +1383,8 @@ COMPAT_SYSCALL_DEFINE5(ppoll, struct pollfd __user *, ufds, 
	if (sigmask) {

		if (sigsetsize != sizeof(compat_sigset_t))

			return -EINVAL;

		if (copy_from_user(&ss32, sigmask, sizeof(ss32)))

		if (get_compat_sigset(&ksigmask, sigmask))

			return -EFAULT;

		sigset_from_compat(&ksigmask, &ss32);



		sigdelsetmask(&ksigmask, sigmask(SIGKILL)|sigmask(SIGSTOP));

		sigprocmask(SIG_SETMASK, &ksigmask, &sigsaved);

fs/signalfd.c

+1 −3
Original line number Diff line number Diff line
@@ -312,15 +312,13 @@ COMPAT_SYSCALL_DEFINE4(signalfd4, int, ufd, 
		     compat_size_t, sigsetsize,

		     int, flags)

{

	compat_sigset_t ss32;

	sigset_t tmp;

	sigset_t __user *ksigmask;



	if (sigsetsize != sizeof(compat_sigset_t))

		return -EINVAL;

	if (copy_from_user(&ss32, sigmask, sizeof(ss32)))

	if (get_compat_sigset(&tmp, sigmask))

		return -EFAULT;

	sigset_from_compat(&tmp, &ss32);

	ksigmask = compat_alloc_user_space(sizeof(sigset_t));

	if (copy_to_user(ksigmask, &tmp, sizeof(sigset_t)))

		return -EFAULT;

include/linux/compat.h

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ asmlinkage long compat_sys_settimeofday(struct compat_timeval __user *tv, 


asmlinkage long compat_sys_adjtimex(struct compat_timex __user *utp);



extern void sigset_from_compat(sigset_t *set, const compat_sigset_t *compat);

extern int get_compat_sigset(sigset_t *set, const compat_sigset_t __user *compat);

extern int put_compat_sigset(compat_sigset_t __user *compat,

			     const sigset_t *set, unsigned int size);