113 lines
3.4 KiB
Diff
113 lines
3.4 KiB
Diff
From: Ralf Baechle <ralf@linux-mips.org>
|
|
Date: Tue, 26 Aug 2014 03:03:40 +0200
|
|
Subject: MIPS: Wire up new syscalls getrandom and memfd_create.
|
|
Origin: http://git.linux-mips.org/?p=ralf/upstream-sfr.git;a=commit;h=42944521af97a3b25516f15f3149aec3779656dc
|
|
Bug-Debian: https://bugs.debian.org/760702
|
|
|
|
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
|
|
[bwh: Backported to 3.16:
|
|
- Adjust context
|
|
- Only wire up memfd_create
|
|
- Insert unimplemented-syscall entries for seccomp and getrandom]
|
|
---
|
|
--- a/arch/mips/include/uapi/asm/unistd.h
|
|
+++ b/arch/mips/include/uapi/asm/unistd.h
|
|
@@ -372,16 +372,17 @@
|
|
#define __NR_sched_setattr (__NR_Linux + 349)
|
|
#define __NR_sched_getattr (__NR_Linux + 350)
|
|
#define __NR_renameat2 (__NR_Linux + 351)
|
|
+#define __NR_memfd_create (__NR_Linux + 354)
|
|
|
|
/*
|
|
* Offset of the last Linux o32 flavoured syscall
|
|
*/
|
|
-#define __NR_Linux_syscalls 351
|
|
+#define __NR_Linux_syscalls 354
|
|
|
|
#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
|
|
|
|
#define __NR_O32_Linux 4000
|
|
-#define __NR_O32_Linux_syscalls 351
|
|
+#define __NR_O32_Linux_syscalls 354
|
|
|
|
#if _MIPS_SIM == _MIPS_SIM_ABI64
|
|
|
|
@@ -701,16 +702,17 @@
|
|
#define __NR_sched_setattr (__NR_Linux + 309)
|
|
#define __NR_sched_getattr (__NR_Linux + 310)
|
|
#define __NR_renameat2 (__NR_Linux + 311)
|
|
+#define __NR_memfd_create (__NR_Linux + 314)
|
|
|
|
/*
|
|
* Offset of the last Linux 64-bit flavoured syscall
|
|
*/
|
|
-#define __NR_Linux_syscalls 311
|
|
+#define __NR_Linux_syscalls 314
|
|
|
|
#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
|
|
|
|
#define __NR_64_Linux 5000
|
|
-#define __NR_64_Linux_syscalls 311
|
|
+#define __NR_64_Linux_syscalls 314
|
|
|
|
#if _MIPS_SIM == _MIPS_SIM_NABI32
|
|
|
|
@@ -1034,15 +1036,16 @@
|
|
#define __NR_sched_setattr (__NR_Linux + 313)
|
|
#define __NR_sched_getattr (__NR_Linux + 314)
|
|
#define __NR_renameat2 (__NR_Linux + 315)
|
|
+#define __NR_memfd_create (__NR_Linux + 318)
|
|
|
|
/*
|
|
* Offset of the last N32 flavoured syscall
|
|
*/
|
|
-#define __NR_Linux_syscalls 315
|
|
+#define __NR_Linux_syscalls 318
|
|
|
|
#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
|
|
|
|
#define __NR_N32_Linux 6000
|
|
-#define __NR_N32_Linux_syscalls 315
|
|
+#define __NR_N32_Linux_syscalls 318
|
|
|
|
#endif /* _UAPI_ASM_UNISTD_H */
|
|
--- a/arch/mips/kernel/scall32-o32.S
|
|
+++ b/arch/mips/kernel/scall32-o32.S
|
|
@@ -578,3 +578,6 @@ EXPORT(sys_call_table)
|
|
PTR sys_sched_setattr
|
|
PTR sys_sched_getattr /* 4350 */
|
|
PTR sys_renameat2
|
|
+ PTR sys_ni_syscall /* seccomp */
|
|
+ PTR sys_ni_syscall /* getrandom */
|
|
+ PTR sys_memfd_create
|
|
--- a/arch/mips/kernel/scall64-64.S
|
|
+++ b/arch/mips/kernel/scall64-64.S
|
|
@@ -431,4 +431,7 @@ EXPORT(sys_call_table)
|
|
PTR sys_sched_setattr
|
|
PTR sys_sched_getattr /* 5310 */
|
|
PTR sys_renameat2
|
|
+ PTR sys_ni_syscall /* seccomp */
|
|
+ PTR sys_ni_syscall /* getrandom */
|
|
+ PTR sys_memfd_create
|
|
.size sys_call_table,.-sys_call_table
|
|
--- a/arch/mips/kernel/scall64-n32.S
|
|
+++ b/arch/mips/kernel/scall64-n32.S
|
|
@@ -424,4 +424,7 @@ EXPORT(sysn32_call_table)
|
|
PTR sys_sched_setattr
|
|
PTR sys_sched_getattr
|
|
PTR sys_renameat2 /* 6315 */
|
|
+ PTR sys_ni_syscall /* seccomp */
|
|
+ PTR sys_ni_syscall /* getrandom */
|
|
+ PTR sys_memfd_create
|
|
.size sysn32_call_table,.-sysn32_call_table
|
|
--- a/arch/mips/kernel/scall64-o32.S
|
|
+++ b/arch/mips/kernel/scall64-o32.S
|
|
@@ -557,4 +557,7 @@ EXPORT(sys32_call_table)
|
|
PTR sys_sched_setattr
|
|
PTR sys_sched_getattr /* 4350 */
|
|
PTR sys_renameat2
|
|
+ PTR sys_ni_syscall /* seccomp */
|
|
+ PTR sys_ni_syscall /* getrandom */
|
|
+ PTR sys_memfd_create
|
|
.size sys32_call_table,.-sys32_call_table
|