Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd33c436 authored by James Morris's avatar James Morris
Browse files

Merge tag 'seccomp-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into next

parents 2ccf4661 c2e1f2e3

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -7953,6 +7953,16 @@ S: Maintained 
F:	drivers/mmc/host/sdhci.*

F:	drivers/mmc/host/sdhci-pltfm.[ch]



SECURE COMPUTING

M:	Kees Cook <keescook@chromium.org>

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp

S:	Supported

F:	kernel/seccomp.c

F:	include/uapi/linux/seccomp.h

F:	include/linux/seccomp.h

K:	\bsecure_computing

K:	\bTIF_SECCOMP\b



SECURE DIGITAL HOST CONTROLLER INTERFACE, OPEN FIRMWARE BINDINGS (SDHCI-OF)

M:	Anton Vorontsov <anton@enomsg.org>

L:	linuxppc-dev@lists.ozlabs.org

arch/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ config HAVE_ARCH_SECCOMP_FILTER 
	  - secure_computing is called from a ptrace_event()-safe context

	  - secure_computing return value is checked and a return value of -1

	    results in the system call being skipped immediately.

	  - seccomp syscall wired up



config SECCOMP_FILTER

	def_bool y

arch/arm/include/uapi/asm/unistd.h

+1 −0
Original line number Diff line number Diff line
@@ -409,6 +409,7 @@ 
#define __NR_sched_setattr		(__NR_SYSCALL_BASE+380)

#define __NR_sched_getattr		(__NR_SYSCALL_BASE+381)

#define __NR_renameat2			(__NR_SYSCALL_BASE+382)

#define __NR_seccomp			(__NR_SYSCALL_BASE+383)



/*

 * This may need to be greater than __NR_last_syscall+1 in order to

arch/arm/kernel/calls.S

+1 −0
Original line number Diff line number Diff line
@@ -392,6 +392,7 @@ 
/* 380 */	CALL(sys_sched_setattr)

		CALL(sys_sched_getattr)

		CALL(sys_renameat2)

		CALL(sys_seccomp)

#ifndef syscalls_counted

.equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls

#define syscalls_counted

arch/mips/include/uapi/asm/unistd.h

+9 −6
Original line number Diff line number Diff line
@@ -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_seccomp			(__NR_Linux + 352)



/*

 * Offset of the last Linux o32 flavoured syscall

 */

#define __NR_Linux_syscalls		351

#define __NR_Linux_syscalls		352



#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */



#define __NR_O32_Linux			4000

#define __NR_O32_Linux_syscalls		351

#define __NR_O32_Linux_syscalls		352



#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_seccomp			(__NR_Linux + 312)



/*

 * Offset of the last Linux 64-bit flavoured syscall

 */

#define __NR_Linux_syscalls		311

#define __NR_Linux_syscalls		312



#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */



#define __NR_64_Linux			5000

#define __NR_64_Linux_syscalls		311

#define __NR_64_Linux_syscalls		312



#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_seccomp			(__NR_Linux + 316)



/*

 * Offset of the last N32 flavoured syscall

 */

#define __NR_Linux_syscalls		315

#define __NR_Linux_syscalls		316



#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */



#define __NR_N32_Linux			6000

#define __NR_N32_Linux_syscalls		315

#define __NR_N32_Linux_syscalls		316



#endif /* _UAPI_ASM_UNISTD_H */