From: Dominik Brodowski <linux@dominikbrodowski.net>
To: linux-kernel@vger.kernel.org
Cc: viro@ZenIV.linux.org.uk, torvalds@linux-foundation.org,
arnd@arndb.de, linux-arch@vger.kernel.org,
Al Viro <viro@ZenIV.linux.org.uk>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH 003/109] kernel: open-code sys_rt_sigpending() in sys_sigpending()
Date: Thu, 29 Mar 2018 13:22:40 +0200 [thread overview]
Message-ID: <20180329112426.23043-4-linux@dominikbrodowski.net> (raw)
In-Reply-To: <20180329112426.23043-1-linux@dominikbrodowski.net>
A similar but not fully equivalent code path is already open-coded
three times (in sys_rt_sigpending and in the two compat stubs), so
do it a fourth time here.
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: Dominik Brodowski <linux@dominikbrodowski.net>
---
include/linux/syscalls.h | 2 +-
kernel/signal.c | 15 ++++++++++++---
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index 0526286a0314..a63e21e7a3af 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -288,7 +288,7 @@ asmlinkage long sys_capset(cap_user_header_t header,
const cap_user_data_t data);
asmlinkage long sys_personality(unsigned int personality);
-asmlinkage long sys_sigpending(old_sigset_t __user *set);
+asmlinkage long sys_sigpending(old_sigset_t __user *uset);
asmlinkage long sys_sigprocmask(int how, old_sigset_t __user *set,
old_sigset_t __user *oset);
asmlinkage long sys_sigaltstack(const struct sigaltstack __user *uss,
diff --git a/kernel/signal.c b/kernel/signal.c
index c6e4c83dc090..985c61749bcf 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -3629,11 +3629,20 @@ int __compat_save_altstack(compat_stack_t __user *uss, unsigned long sp)
/**
* sys_sigpending - examine pending signals
- * @set: where mask of pending signal is returned
+ * @uset: where mask of pending signal is returned
*/
-SYSCALL_DEFINE1(sigpending, old_sigset_t __user *, set)
+SYSCALL_DEFINE1(sigpending, old_sigset_t __user *, uset)
{
- return sys_rt_sigpending((sigset_t __user *)set, sizeof(old_sigset_t));
+ sigset_t set;
+ int err;
+
+ if (sizeof(old_sigset_t) > sizeof(*uset))
+ return -EINVAL;
+
+ err = do_sigpending(&set);
+ if (!err && copy_to_user(uset, &set, sizeof(old_sigset_t)))
+ err = -EFAULT;
+ return err;
}
#ifdef CONFIG_COMPAT
--
2.16.3
next prev parent reply other threads:[~2018-03-29 11:26 UTC|newest]
Thread overview: 116+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-29 11:22 [PATCH 000/109] remove in-kernel calls to syscalls Dominik Brodowski
2018-03-29 11:22 ` [PATCH 001/109] syscalls: define and explain goal to not call syscalls in the kernel Dominik Brodowski
2018-03-29 11:22 ` [PATCH 002/109] kernel: use kernel_wait4() instead of sys_wait4() Dominik Brodowski
2018-04-02 16:14 ` Luis R. Rodriguez
2018-03-29 11:22 ` Dominik Brodowski [this message]
2018-03-29 11:22 ` [PATCH 004/109] kexec: call do_kexec_load() in compat syscall directly Dominik Brodowski
2018-03-29 11:22 ` [PATCH 005/109] mm: use do_futex() instead of sys_futex() in mm_release() Dominik Brodowski
2018-03-29 11:22 ` [PATCH 006/109] x86: use _do_fork() in compat_sys_x86_clone() Dominik Brodowski
2018-03-29 11:22 ` [PATCH 007/109] x86: remove compat_sys_x86_waitpid() Dominik Brodowski
2018-03-29 11:22 ` [PATCH 008/109] net: socket: add __sys_recvfrom() helper; remove in-kernel call to syscall Dominik Brodowski
2018-03-29 11:22 ` [PATCH 009/109] net: socket: add __sys_sendto() " Dominik Brodowski
2018-03-29 11:22 ` [PATCH 010/109] net: socket: add __sys_accept4() " Dominik Brodowski
2018-03-29 11:22 ` [PATCH 011/109] net: socket: add __sys_socket() " Dominik Brodowski
2018-03-29 11:22 ` [PATCH 012/109] net: socket: add __sys_bind() " Dominik Brodowski
2018-03-29 11:22 ` [PATCH 013/109] net: socket: add __sys_connect() " Dominik Brodowski
2018-03-29 11:22 ` [PATCH 014/109] net: socket: add __sys_listen() " Dominik Brodowski
2018-03-29 11:22 ` [PATCH 015/109] net: socket: add __sys_getsockname() " Dominik Brodowski
2018-03-29 11:22 ` [PATCH 016/109] net: socket: add __sys_getpeername() " Dominik Brodowski
2018-03-29 11:22 ` [PATCH 017/109] net: socket: add __sys_socketpair() " Dominik Brodowski
2018-03-29 11:22 ` [PATCH 018/109] net: socket: add __sys_shutdown() " Dominik Brodowski
2018-03-29 11:22 ` [PATCH 019/109] net: socket: add __sys_setsockopt() " Dominik Brodowski
2018-03-29 11:22 ` [PATCH 020/109] net: socket: add __sys_getsockopt() " Dominik Brodowski
2018-03-29 11:22 ` [PATCH 021/109] net: socket: add do_sys_recvmmsg() " Dominik Brodowski
2018-03-29 11:22 ` [PATCH 022/109] net: socket: move check for forbid_cmsg_compat to __sys_...msg() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 023/109] net: socket: replace calls to sys_send() with __sys_sendto() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 024/109] net: socket: replace call to sys_recv() with __sys_recvfrom() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 025/109] net: socket: add __compat_sys_recvfrom() helper; remove in-kernel call to compat syscall Dominik Brodowski
2018-03-29 11:23 ` [PATCH 026/109] net: socket: add __compat_sys_setsockopt() " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 027/109] net: socket: add __compat_sys_getsockopt() " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 028/109] net: socket: add __compat_sys_recvmmsg() " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 029/109] net: socket: add __compat_sys_...msg() helpers; remove in-kernel calls to compat syscalls Dominik Brodowski
2018-03-29 11:23 ` [PATCH 030/109] ipc: add semtimedop syscall/compat_syscall wrappers Dominik Brodowski
2018-03-29 11:23 ` [PATCH 031/109] ipc: add semget syscall wrapper Dominik Brodowski
2018-03-29 11:23 ` [PATCH 032/109] ipc: add semctl syscall/compat_syscall wrappers Dominik Brodowski
2018-03-29 11:23 ` [PATCH 033/109] ipc: add msgget syscall wrapper Dominik Brodowski
2018-03-29 11:23 ` [PATCH 034/109] ipc: add shmget " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 035/109] ipc: add shmdt " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 036/109] ipc: add shmctl syscall/compat_syscall wrappers Dominik Brodowski
2018-03-29 11:23 ` [PATCH 037/109] ipc: add msgctl " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 038/109] ipc: add msgrcv " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 039/109] ipc: add msgsnd " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 040/109] kernel: add do_getpgid() helper; remove internal call to sys_getpgid() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 041/109] kernel: add do_compat_sigaltstack() helper; remove in-kernel call to compat syscall Dominik Brodowski
2018-03-29 11:23 ` [PATCH 042/109] kernel: provide ksys_*() wrappers for syscalls called by kernel/uid16.c Dominik Brodowski
2018-03-29 11:23 ` [PATCH 043/109] sched: add do_sched_yield() helper; remove in-kernel call to sched_yield() Dominik Brodowski
2018-03-29 11:41 ` Peter Zijlstra
2018-03-29 11:23 ` [PATCH 044/109] mm: add kernel_migrate_pages() helper, move compat syscall to mm/mempolicy.c Dominik Brodowski
2018-03-29 11:23 ` [PATCH 045/109] mm: add kernel_move_pages() helper, move compat syscall to mm/migrate.c Dominik Brodowski
2018-03-29 11:23 ` [PATCH 046/109] mm: add kernel_mbind() helper; remove in-kernel call to syscall Dominik Brodowski
2018-03-29 11:23 ` [PATCH 047/109] mm: add kernel_[sg]et_mempolicy() helpers; remove in-kernel calls to syscalls Dominik Brodowski
2018-03-29 11:23 ` [PATCH 048/109] fs: add do_readlinkat() helper; remove internal call to sys_readlinkat() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 049/109] fs: add do_pipe2() helper; remove internal call to sys_pipe2() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 050/109] fs: add do_renameat2() helper; remove internal call to sys_renameat2() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 051/109] fs: add do_futimesat() helper; remove internal call to sys_futimesat() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 052/109] fs: add do_epoll_*() helpers; remove internal calls to sys_epoll_*() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 053/109] fs: add do_signalfd4() helper; remove internal calls to sys_signalfd4() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 054/109] fs: add do_eventfd() helper; remove internal call to sys_eventfd() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 055/109] fs: add do_lookup_dcookie() helper; remove in-kernel call to syscall Dominik Brodowski
2018-03-29 11:23 ` [PATCH 056/109] fs: add do_vmsplice() " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 057/109] fs: add kern_select() helper; remove in-kernel call to sys_select() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 058/109] fs: add do_compat_fcntl64() helper; remove in-kernel call to compat syscall Dominik Brodowski
2018-03-29 11:23 ` [PATCH 059/109] fs: add do_compat_select() " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 060/109] fs: add do_compat_signalfd4() " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 061/109] fs: add do_compat_futimesat() " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 062/109] inotify: add do_inotify_init() helper; remove in-kernel call to syscall Dominik Brodowski
2018-03-29 11:23 ` [PATCH 063/109] fanotify: add do_fanotify_mark() " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 064/109] fs/quota: add kernel_quotactl() " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 065/109] fs/quota: use COMPAT_SYSCALL_DEFINE for sys32_quotactl() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 066/109] fs: add ksys_mount() helper; remove in-kernel calls to sys_mount() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 067/109] fs: add ksys_umount() helper; remove in-kernel call to sys_umount() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 068/109] fs: add ksys_dup{,3}() helper; remove in-kernel calls to sys_dup{,3}() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 069/109] fs: add ksys_chroot() helper; remove-in kernel calls to sys_chroot() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 070/109] fs: add ksys_write() helper; remove in-kernel calls to sys_write() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 071/109] fs: add ksys_chdir() helper; remove in-kernel calls to sys_chdir() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 072/109] fs: add ksys_unlink() wrapper; remove in-kernel calls to sys_unlink() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 073/109] hostfs: rename do_rmdir() to hostfs_do_rmdir() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 074/109] fs: add ksys_rmdir() wrapper; remove in-kernel calls to sys_rmdir() Dominik Brodowski
2018-03-29 11:23 ` [PATCH 075/109] fs: add do_mkdirat() helper and ksys_mkdir() wrapper; remove in-kernel calls to syscall Dominik Brodowski
2018-03-29 11:23 ` [PATCH 076/109] fs: add do_symlinkat() helper and ksys_symlink() " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 077/109] fs: add do_mknodat() helper and ksys_mknod() " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 078/109] fs: add do_linkat() helper and ksys_link() " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 079/109] fs: add ksys_fchmod() and do_fchmodat() helpers and ksys_chmod() " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 080/109] fs: add do_faccessat() helper and ksys_access() " Dominik Brodowski
2018-03-29 11:23 ` [PATCH 081/109] fs: add do_fchownat(), ksys_fchown() helpers and ksys_{,l}chown() wrappers Dominik Brodowski
2018-03-29 11:23 ` [PATCH 082/109] fs: add ksys_ftruncate() wrapper; remove in-kernel calls to sys_ftruncate() Dominik Brodowski
2018-03-29 11:24 ` [PATCH 083/109] fs: add ksys_close() wrapper; remove in-kernel calls to sys_close() Dominik Brodowski
2018-03-29 11:24 ` [PATCH 084/109] fs: add ksys_open() wrapper; remove in-kernel calls to sys_open() Dominik Brodowski
2018-03-29 11:24 ` [PATCH 085/109] fs: add ksys_getdents64() helper; remove in-kernel calls to sys_getdents64() Dominik Brodowski
2018-03-29 11:24 ` [PATCH 086/109] fs: add ksys_ioctl() helper; remove in-kernel calls to sys_ioctl() Dominik Brodowski
2018-03-29 11:24 ` [PATCH 087/109] fs: add ksys_lseek() helper; remove in-kernel calls to sys_lseek() Dominik Brodowski
2018-03-29 11:24 ` [PATCH 088/109] fs: add ksys_read() helper; remove in-kernel calls to sys_read() Dominik Brodowski
2018-03-29 11:24 ` [PATCH 089/109] fs: add ksys_sync() helper; remove in-kernel calls to sys_sync() Dominik Brodowski
2018-03-29 11:24 ` [PATCH 090/109] kernel: add ksys_unshare() helper; remove in-kernel calls to sys_unshare() Dominik Brodowski
2018-03-29 11:24 ` [PATCH 091/109] kernel: add ksys_setsid() helper; remove in-kernel call to sys_setsid() Dominik Brodowski
2018-03-29 11:24 ` [PATCH 092/109] fs: add ksys_sync_file_range helper(); remove in-kernel calls to syscall Dominik Brodowski
2018-03-29 11:24 ` [PATCH 093/109] fs: add ksys_truncate() wrapper; remove in-kernel calls to sys_truncate() Dominik Brodowski
2018-03-29 11:24 ` [PATCH 094/109] fs: add ksys_p{read,write}64() helpers; remove in-kernel calls to syscalls Dominik Brodowski
2018-03-29 11:24 ` [PATCH 095/109] fs: add ksys_fallocate() wrapper; remove in-kernel calls to sys_fallocate() Dominik Brodowski
2018-03-29 11:24 ` [PATCH 096/109] mm: add ksys_fadvise64_64() helper; remove in-kernel call to sys_fadvise64_64() Dominik Brodowski
2018-03-29 11:24 ` [PATCH 097/109] mm: add ksys_mmap_pgoff() helper; remove in-kernel calls to sys_mmap_pgoff() Dominik Brodowski
2018-03-29 11:24 ` [PATCH 098/109] mm: add ksys_readahead() helper; remove in-kernel calls to sys_readahead() Dominik Brodowski
2018-03-29 11:24 ` [PATCH 099/109] x86/ioport: add ksys_ioperm() helper; remove in-kernel calls to sys_ioperm() Dominik Brodowski
2018-03-29 11:24 ` [PATCH 100/109] x86: fix sys_sigreturn() return type to be long, not unsigned long Dominik Brodowski
2018-03-29 11:24 ` [PATCH 101/109] x86/sigreturn: use SYSCALL_DEFINE0 Dominik Brodowski
2018-03-29 11:24 ` [PATCH 102/109] kexec: move sys_kexec_load() prototype to syscalls.h Dominik Brodowski
2018-03-29 11:24 ` [PATCH 103/109] syscalls: sort syscall prototypes in include/linux/syscalls.h Dominik Brodowski
2018-03-29 11:24 ` [PATCH 104/109] net: remove compat_sys_*() prototypes from net/compat.h Dominik Brodowski
2018-03-29 11:24 ` [PATCH 105/109] syscalls: sort syscall prototypes in include/linux/compat.h Dominik Brodowski
2018-03-29 11:24 ` [PATCH 106/109] syscalls/x86: auto-create compat_sys_*() prototypes Dominik Brodowski
2018-03-29 11:24 ` [PATCH 107/109] kernel/sys_ni: sort cond_syscall() entries Dominik Brodowski
2018-03-29 11:24 ` [PATCH 108/109] kernel/sys_ni: remove {sys_,sys_compat} from cond_syscall definitions Dominik Brodowski
2018-03-29 11:24 ` [PATCH 109/109] bpf: whitelist all syscalls for error injection Dominik Brodowski
2018-03-29 14:20 ` [PATCH 000/109] remove in-kernel calls to syscalls Matthew Wilcox
2018-03-29 14:42 ` Dominik Brodowski
2018-03-29 14:46 ` David Laight
2018-03-29 14:55 ` Dominik Brodowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180329112426.23043-4-linux@dominikbrodowski.net \
--to=linux@dominikbrodowski.net \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).