From: Dominik Brodowski <linux@dominikbrodowski.net>
To: linux-kernel@vger.kernel.org, torvalds@linux-foundation.org,
viro@ZenIV.linux.org.uk, arnd@arndb.de,
linux-arch@vger.kernel.org
Cc: Jan Kara <jack@suse.com>, Christoph Hellwig <hch@infradead.org>
Subject: [PATCH 19/45] fs/quota: use COMPAT_SYSCALL_DEFINE for sys32_quotactl()
Date: Thu, 22 Mar 2018 10:00:33 +0100 [thread overview]
Message-ID: <20180322090059.19361-20-linux@dominikbrodowski.net> (raw)
In-Reply-To: <20180322090059.19361-1-linux@dominikbrodowski.net>
While sys32_quotactl() is only needed on x86, it can use the recommended
COMPAT_SYSCALL_DEFINEx() machinery for its setup.
Cc: Jan Kara <jack@suse.com>
Cc: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---
arch/x86/entry/syscalls/syscall_32.tbl | 2 +-
fs/quota/compat.c | 5 +++--
include/linux/compat.h | 3 +++
include/linux/syscalls.h | 4 +---
kernel/sys_ni.c | 2 +-
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl
index 2a5e99cff859..09338dd2bd94 100644
--- a/arch/x86/entry/syscalls/syscall_32.tbl
+++ b/arch/x86/entry/syscalls/syscall_32.tbl
@@ -137,7 +137,7 @@
128 i386 init_module sys_init_module
129 i386 delete_module sys_delete_module
130 i386 get_kernel_syms
-131 i386 quotactl sys_quotactl sys32_quotactl
+131 i386 quotactl sys_quotactl compat_sys_quotactl32
132 i386 getpgid sys_getpgid
133 i386 fchdir sys_fchdir
134 i386 bdflush sys_bdflush
diff --git a/fs/quota/compat.c b/fs/quota/compat.c
index 1577a2fd51f4..c30572857619 100644
--- a/fs/quota/compat.c
+++ b/fs/quota/compat.c
@@ -41,8 +41,9 @@ struct compat_fs_quota_stat {
__u16 qs_iwarnlimit;
};
-asmlinkage long sys32_quotactl(unsigned int cmd, const char __user *special,
- qid_t id, void __user *addr)
+COMPAT_SYSCALL_DEFINE4(quotactl32, unsigned int, cmd,
+ const char __user *, special, qid_t, id,
+ void __user *, addr)
{
unsigned int cmds;
struct if_dqblk __user *dqblk;
diff --git a/include/linux/compat.h b/include/linux/compat.h
index 16c3027074a2..f1649a5e6716 100644
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -461,6 +461,9 @@ asmlinkage ssize_t compat_sys_pwritev2(compat_ulong_t fd,
const struct compat_iovec __user *vec,
compat_ulong_t vlen, u32 pos_low, u32 pos_high, rwf_t flags);
+asmlinkage long compat_sys_quotactl32(unsigned int cmd,
+ const char __user *special, qid_t id, void __user *addr);
+
#ifdef __ARCH_WANT_COMPAT_SYS_PREADV64
asmlinkage long compat_sys_preadv64(unsigned long fd,
const struct compat_iovec __user *vec,
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index f30083190ae4..a3f42f5f3b08 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -241,8 +241,6 @@ static inline void addr_limit_user_check(void)
#endif
}
-asmlinkage long sys32_quotactl(unsigned int cmd, const char __user *special,
- qid_t id, void __user *addr);
asmlinkage long sys_time(time_t __user *tloc);
asmlinkage long sys_stime(time_t __user *tptr);
asmlinkage long sys_gettimeofday(struct timeval __user *tv,
@@ -625,7 +623,7 @@ asmlinkage long sys_chdir(const char __user *filename);
asmlinkage long sys_fchdir(unsigned int fd);
asmlinkage long sys_rmdir(const char __user *pathname);
asmlinkage long sys_lookup_dcookie(u64 cookie64, char __user *buf, size_t len);
-asmlinkage long sys_quotactl(unsigned int cmd, const char __user *special,
+asmlinkage long sys_quotactl32(unsigned int cmd, const char __user *special,
qid_t id, void __user *addr);
asmlinkage long sys_getdents(unsigned int fd,
struct linux_dirent __user *dirent,
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c
index b5189762d275..951dbda5c2b4 100644
--- a/kernel/sys_ni.c
+++ b/kernel/sys_ni.c
@@ -18,7 +18,7 @@ asmlinkage long sys_ni_syscall(void)
}
cond_syscall(sys_quotactl);
-cond_syscall(sys32_quotactl);
+cond_syscall(compat_sys_quotactl32);
cond_syscall(sys_acct);
cond_syscall(sys_lookup_dcookie);
cond_syscall(compat_sys_lookup_dcookie);
--
2.16.2
next prev parent reply other threads:[~2018-03-22 9:00 UTC|newest]
Thread overview: 120+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-22 9:00 [PATCH 00/45] remove in-kernel syscall invocations (part 3 == remainder outside arch/) Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 01/45] fs: add ksys_getdents64() helper; remove in-kernel calls to sys_getdents64() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 02/45] fs: add ksys_ioctl() helper; remove in-kernel calls to sys_ioctl() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 03/45] fs: add ksys_lseek() helper; remove in-kernel calls to sys_lseek() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 04/45] fs: add ksys_read() helper; remove in-kernel calls to sys_read() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 05/45] fs: add ksys_sync() helper; remove in-kernel calls to sys_sync() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 06/45] fs: add do_lookup_dcookie() helper; remove in-kernel call to syscall Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 07/45] fs: add do_vmsplice() " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 08/45] fs: add kern_select() helper; remove in-kernel call to sys_select() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 09/45] fs: add ksys_truncate() wrapper; remove in-kernel calls to sys_truncate() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 10/45] fs: add ksys_p{read,write}64() helpers; remove in-kernel calls to syscalls Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 11/45] fs: add ksys_fallocate() wrapper; remove in-kernel calls to sys_fallocate() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 12/45] fs: add do_compat_fcntl64() helper; remove in-kernel call to comapt syscall Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 13/45] fs: add do_compat_select() " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 14/45] fs: add do_compat_signalfd4() " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 15/45] fs: add do_compat_futimesat() " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 16/45] inotify: add do_inotify_init() helper; remove in-kernel call to syscall Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-26 12:25 ` Jan Kara
2018-03-26 12:25 ` Jan Kara
2018-03-22 9:00 ` [PATCH 17/45] fanotify: add do_fanotify_mark() " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-26 12:25 ` Jan Kara
2018-03-26 12:25 ` Jan Kara
2018-03-22 9:00 ` [PATCH 18/45] fs/quota: add kernel_quotactl() " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-26 12:26 ` Jan Kara
2018-03-26 12:26 ` Jan Kara
2018-03-22 9:00 ` Dominik Brodowski [this message]
2018-03-22 9:00 ` [PATCH 19/45] fs/quota: use COMPAT_SYSCALL_DEFINE for sys32_quotactl() Dominik Brodowski
2018-03-26 12:33 ` Jan Kara
2018-03-26 12:33 ` Jan Kara
2018-03-22 9:00 ` [PATCH 20/45] kernel: add do_compat_sigaltstack() helper; remove in-kernel call to compat syscall Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 21/45] kernel: add ksys_setsid() helper; remove in-kernel call to sys_setsid() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 22/45] kernel: provide ksys_*() wrappers for syscalls called by kernel/uid16.c Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 10:21 ` Any chance that kernel/uid6.c can go? [Was: [PATCH 22/45] kernel: provide ksys_*() wrappers for syscalls called by kernel/uid16.c] Dominik Brodowski
2018-03-22 10:21 ` Dominik Brodowski
2018-03-22 17:57 ` Linus Torvalds
2018-03-22 17:57 ` Linus Torvalds
2018-03-22 9:00 ` [PATCH 23/45] sched: add do_sched_yield() helper; remove in-kernel call to sched_yield() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 17:29 ` Peter Zijlstra
2018-03-22 17:29 ` Peter Zijlstra
2018-03-22 17:41 ` Dominik Brodowski
2018-03-22 17:41 ` Dominik Brodowski
2018-03-22 17:44 ` Linus Torvalds
2018-03-22 17:44 ` Linus Torvalds
2018-03-22 9:00 ` [PATCH 24/45] kexec: call do_kexec_load() in compat syscall directly Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 25/45] mm: add kernel_migrate_pages() helper, move compat syscall to mm/mempolicy.c Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 26/45] mm: add kernel_move_pages() helper, move compat syscall to mm/migrate.c Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 27/45] mm: add kernel_mbind() helper; remove in-kernel call to syscall Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 28/45] mm: add kernel_[sg]et_mempolicy() helpers; remove in-kernel calls to syscalls Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 29/45] mm: add ksys_readahead() helper; remove in-kernel calls to sys_readahead() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 30/45] ipc: add semtimedop syscall/compat_syscall wrappers Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 31/45] ipc: add semget syscall wrapper Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 32/45] ipc: add semctl syscall/compat_syscall wrappers Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 33/45] ipc: add msgget syscall wrapper Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 34/45] ipc: add shmget " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 35/45] ipc: add shmdt " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 36/45] ipc: add shmctl syscall/compat_syscall wrappers Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 37/45] ipc: add msgctl " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 38/45] ipc: add msgrcv " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 39/45] ipc: add msgsnd " Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 40/45] x86: use _do_fork() in compat_sys_x86_clone() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:26 ` Thomas Gleixner
2018-03-22 9:26 ` Thomas Gleixner
2018-03-22 9:00 ` [PATCH 41/45] x86: remove compat_sys_x86_waitpid() Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:27 ` Thomas Gleixner
2018-03-22 9:27 ` Thomas Gleixner
2018-03-22 9:00 ` [PATCH 42/45] x86: fix sys_sigreturn() return type to be long, not unsigned long Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:27 ` Thomas Gleixner
2018-03-22 9:27 ` Thomas Gleixner
2018-03-22 9:00 ` [PATCH 43/45] x86/sigreturn: use SYSCALL_DEFINE0 Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:27 ` Thomas Gleixner
2018-03-22 9:27 ` Thomas Gleixner
2018-03-22 9:00 ` [PATCH 44/45] kernel/sys_ni: sort cond_syscall() entries Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 9:00 ` [PATCH 45/45] bpf: whitelist all syscalls for error injection Dominik Brodowski
2018-03-22 9:00 ` Dominik Brodowski
2018-03-22 20:29 ` [PATCH 00/45] remove in-kernel syscall invocations (part 3 == remainder outside arch/) Linus Torvalds
2018-03-22 20:29 ` Linus Torvalds
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=20180322090059.19361-20-linux@dominikbrodowski.net \
--to=linux@dominikbrodowski.net \
--cc=arnd@arndb.de \
--cc=hch@infradead.org \
--cc=jack@suse.com \
--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