Skip to content

Commit 88db0aa

Browse files
nixiaomingtorvalds
nixiaoming
authored and
torvalds
committed
all arch: remove system call sys_sysctl
Since commit 61a47c1 ("sysctl: Remove the sysctl system call"), sys_sysctl is actually unavailable: any input can only return an error. We have been warning about people using the sysctl system call for years and believe there are no more users. Even if there are users of this interface if they have not complained or fixed their code by now they probably are not going to, so there is no point in warning them any longer. So completely remove sys_sysctl on all architectures. [[email protected]: s390: fix build error for sys_call_table_emu] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Xiaoming Ni <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Acked-by: Will Deacon <[email protected]> [arm/arm64] Acked-by: "Eric W. Biederman" <[email protected]> Cc: Aleksa Sarai <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Al Viro <[email protected]> Cc: Andi Kleen <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Arnaldo Carvalho de Melo <[email protected]> Cc: Arnd Bergmann <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: Bin Meng <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: Catalin Marinas <[email protected]> Cc: chenzefeng <[email protected]> Cc: Christian Borntraeger <[email protected]> Cc: Christian Brauner <[email protected]> Cc: Chris Zankel <[email protected]> Cc: David Howells <[email protected]> Cc: David S. Miller <[email protected]> Cc: Diego Elio Pettenò <[email protected]> Cc: Dmitry Vyukov <[email protected]> Cc: Dominik Brodowski <[email protected]> Cc: Fenghua Yu <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: Heiko Carstens <[email protected]> Cc: Helge Deller <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Iurii Zaikin <[email protected]> Cc: Ivan Kokshaysky <[email protected]> Cc: James Bottomley <[email protected]> Cc: Jens Axboe <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Kars de Jong <[email protected]> Cc: Kees Cook <[email protected]> Cc: Krzysztof Kozlowski <[email protected]> Cc: Luis Chamberlain <[email protected]> Cc: Marco Elver <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Martin K. Petersen <[email protected]> Cc: Masahiro Yamada <[email protected]> Cc: Matt Turner <[email protected]> Cc: Max Filippov <[email protected]> Cc: Michael Ellerman <[email protected]> Cc: Michal Simek <[email protected]> Cc: Miklos Szeredi <[email protected]> Cc: Minchan Kim <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Naveen N. Rao <[email protected]> Cc: Nick Piggin <[email protected]> Cc: Oleg Nesterov <[email protected]> Cc: Olof Johansson <[email protected]> Cc: Paul Burton <[email protected]> Cc: "Paul E. McKenney" <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra (Intel) <[email protected]> Cc: Randy Dunlap <[email protected]> Cc: Ravi Bangoria <[email protected]> Cc: Richard Henderson <[email protected]> Cc: Rich Felker <[email protected]> Cc: Russell King <[email protected]> Cc: Sami Tolvanen <[email protected]> Cc: Sargun Dhillon <[email protected]> Cc: Stephen Rothwell <[email protected]> Cc: Sudeep Holla <[email protected]> Cc: Sven Schnelle <[email protected]> Cc: Thiago Jung Bauermann <[email protected]> Cc: Thomas Bogendoerfer <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Tony Luck <[email protected]> Cc: Vasily Gorbik <[email protected]> Cc: Vlastimil Babka <[email protected]> Cc: Yoshinori Sato <[email protected]> Cc: Zhou Yanjie <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Linus Torvalds <[email protected]>
1 parent c734124 commit 88db0aa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+24
-227
lines changed

‎arch/alpha/kernel/syscalls/syscall.tbl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@
249249
316 common mlockall sys_mlockall
250250
317 common munlockall sys_munlockall
251251
318 common sysinfo sys_sysinfo
252-
319 common _sysctl sys_sysctl
252+
319 common _sysctl sys_ni_syscall
253253
# 320 was sys_idle
254254
321 common oldumount sys_oldumount
255255
322 common swapon sys_swapon

‎arch/arm/configs/am200epdkit_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ CONFIG_LOCALVERSION="gum"
33
CONFIG_SYSVIPC=y
44
CONFIG_SYSFS_DEPRECATED_V2=y
55
CONFIG_EXPERT=y
6-
# CONFIG_SYSCTL_SYSCALL is not set
76
# CONFIG_EPOLL is not set
87
# CONFIG_SHMEM is not set
98
# CONFIG_VM_EVENT_COUNTERS is not set

‎arch/arm/tools/syscall.tbl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
146 common writev sys_writev
163163
147 common getsid sys_getsid
164164
148 common fdatasync sys_fdatasync
165-
149 common _sysctl sys_sysctl
165+
149 common _sysctl sys_ni_syscall
166166
150 common mlock sys_mlock
167167
151 common munlock sys_munlock
168168
152 common mlockall sys_mlockall

‎arch/arm64/include/asm/unistd32.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,8 @@ __SYSCALL(__NR_writev, compat_sys_writev)
308308
__SYSCALL(__NR_getsid, sys_getsid)
309309
#define __NR_fdatasync 148
310310
__SYSCALL(__NR_fdatasync, sys_fdatasync)
311-
#define __NR__sysctl 149
312-
__SYSCALL(__NR__sysctl, compat_sys_sysctl)
311+
/* 149 was sys_sysctl */
312+
__SYSCALL(149, sys_ni_syscall)
313313
#define __NR_mlock 150
314314
__SYSCALL(__NR_mlock, sys_mlock)
315315
#define __NR_munlock 151

‎arch/ia64/kernel/syscalls/syscall.tbl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
123 common writev sys_writev
136136
124 common pread64 sys_pread64
137137
125 common pwrite64 sys_pwrite64
138-
126 common _sysctl sys_sysctl
138+
126 common _sysctl sys_ni_syscall
139139
127 common mmap sys_mmap
140140
128 common munmap sys_munmap
141141
129 common mlock sys_mlock

‎arch/m68k/kernel/syscalls/syscall.tbl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
146 common writev sys_writev
157157
147 common getsid sys_getsid
158158
148 common fdatasync sys_fdatasync
159-
149 common _sysctl sys_sysctl
159+
149 common _sysctl sys_ni_syscall
160160
150 common mlock sys_mlock
161161
151 common munlock sys_munlock
162162
152 common mlockall sys_mlockall

‎arch/microblaze/kernel/syscalls/syscall.tbl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
146 common writev sys_writev
157157
147 common getsid sys_getsid
158158
148 common fdatasync sys_fdatasync
159-
149 common _sysctl sys_sysctl
159+
149 common _sysctl sys_ni_syscall
160160
150 common mlock sys_mlock
161161
151 common munlock sys_munlock
162162
152 common mlockall sys_mlockall

‎arch/mips/configs/cu1000-neo_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ CONFIG_CGROUP_CPUACCT=y
1717
CONFIG_NAMESPACES=y
1818
CONFIG_USER_NS=y
1919
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
20-
CONFIG_SYSCTL_SYSCALL=y
2120
CONFIG_KALLSYMS_ALL=y
2221
CONFIG_EMBEDDED=y
2322
# CONFIG_VM_EVENT_COUNTERS is not set

‎arch/mips/kernel/syscalls/syscall_n32.tbl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
149 n32 munlockall sys_munlockall
160160
150 n32 vhangup sys_vhangup
161161
151 n32 pivot_root sys_pivot_root
162-
152 n32 _sysctl compat_sys_sysctl
162+
152 n32 _sysctl sys_ni_syscall
163163
153 n32 prctl sys_prctl
164164
154 n32 adjtimex sys_adjtimex_time32
165165
155 n32 setrlimit compat_sys_setrlimit

‎arch/mips/kernel/syscalls/syscall_n64.tbl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
149 n64 munlockall sys_munlockall
160160
150 n64 vhangup sys_vhangup
161161
151 n64 pivot_root sys_pivot_root
162-
152 n64 _sysctl sys_sysctl
162+
152 n64 _sysctl sys_ni_syscall
163163
153 n64 prctl sys_prctl
164164
154 n64 adjtimex sys_adjtimex
165165
155 n64 setrlimit sys_setrlimit

0 commit comments

Comments
 (0)