Commit 570484bf authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

fs: add do_compat_signalfd4() helper; remove in-kernel call to compat syscall 

Using the fs-internal do_compat_signalfd4() helper allows us to get rid of
the fs-internal call to the compat_sys_signalfd4() syscall.

This patch is part of a series which removes in-kernel calls to syscalls.
On this basis, the syscall entry path can be streamlined. For details, see
http://lkml.kernel.org/r/20180325162527.GA17492@light.dominikbrodowski.net



Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 05585e44

fs/signalfd.c

+12 −5
Original line number Diff line number Diff line
@@ -323,10 +323,9 @@ SYSCALL_DEFINE3(signalfd, int, ufd, sigset_t __user *, user_mask, 
}



#ifdef CONFIG_COMPAT

COMPAT_SYSCALL_DEFINE4(signalfd4, int, ufd,

		     const compat_sigset_t __user *,sigmask,

		     compat_size_t, sigsetsize,

		     int, flags)

static long do_compat_signalfd4(int ufd,

			const compat_sigset_t __user *sigmask,

			compat_size_t sigsetsize, int flags)

{

	sigset_t tmp;

	sigset_t __user *ksigmask;
@@ -342,10 +341,18 @@ COMPAT_SYSCALL_DEFINE4(signalfd4, int, ufd, 
	return do_signalfd4(ufd, ksigmask, sizeof(sigset_t), flags);

}



COMPAT_SYSCALL_DEFINE4(signalfd4, int, ufd,

		     const compat_sigset_t __user *, sigmask,

		     compat_size_t, sigsetsize,

		     int, flags)

{

	return do_compat_signalfd4(ufd, sigmask, sigsetsize, flags);

}



COMPAT_SYSCALL_DEFINE3(signalfd, int, ufd,

		     const compat_sigset_t __user *,sigmask,

		     compat_size_t, sigsetsize)

{

	return compat_sys_signalfd4(ufd, sigmask, sigsetsize, 0);

	return do_compat_signalfd4(ufd, sigmask, sigsetsize, 0);

}

#endif