arch, mm: wire up memfd_secret system call where relevant
Wire up memfd_secret system call on architectures that define ARCH_HAS_SET_DIRECT_MAP, namely arm64, risc-v and x86. Link: https://lkml.kernel.org/r/20210518072034.31572-7-rppt@kernel.org Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> Acked-by: Palmer Dabbelt <palmerdabbelt@google.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Acked-by: David Hildenbrand <david@redhat.com> Acked-by: James Bottomley <James.Bottomley@HansenPartnership.com> Cc: Alexander Viro <viro@zeniv.linux.org.uk> Cc: Andy Lutomirski <luto@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Christopher Lameter <cl@linux.com> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: David Hildenbrand <david@redhat.com> Cc: Elena Reshetova <elena.reshetova@intel.com> Cc: Hagen Paul Pfeifer <hagen@jauu.net> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: James Bottomley <jejb@linux.ibm.com> Cc: "Kirill A. Shutemov" <kirill@shutemov.name> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: Michael Kerrisk <mtk.manpages@gmail.com> Cc: Palmer Dabbelt <palmer@dabbelt.com> Cc: Paul Walmsley <paul.walmsley@sifive.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Rick Edgecombe <rick.p.edgecombe@intel.com> Cc: Roman Gushchin <guro@fb.com> Cc: Shakeel Butt <shakeelb@google.com> Cc: Shuah Khan <shuah@kernel.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tycho Andersen <tycho@tycho.ws> Cc: Will Deacon <will@kernel.org> Cc: kernel test robot <lkp@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
		
							parent
							
								
									9a436f8ff6
								
							
						
					
					
						commit
						7bb7f2ac24
					
				| @ -20,5 +20,6 @@ | ||||
| #define __ARCH_WANT_SET_GET_RLIMIT | ||||
| #define __ARCH_WANT_TIME32_SYSCALLS | ||||
| #define __ARCH_WANT_SYS_CLONE3 | ||||
| #define __ARCH_WANT_MEMFD_SECRET | ||||
| 
 | ||||
| #include <asm-generic/unistd.h> | ||||
|  | ||||
| @ -9,6 +9,7 @@ | ||||
|  */ | ||||
| 
 | ||||
| #define __ARCH_WANT_SYS_CLONE | ||||
| #define __ARCH_WANT_MEMFD_SECRET | ||||
| 
 | ||||
| #include <uapi/asm/unistd.h> | ||||
| 
 | ||||
|  | ||||
| @ -451,3 +451,4 @@ | ||||
| 444	i386	landlock_create_ruleset	sys_landlock_create_ruleset | ||||
| 445	i386	landlock_add_rule	sys_landlock_add_rule | ||||
| 446	i386	landlock_restrict_self	sys_landlock_restrict_self | ||||
| 447	i386	memfd_secret		sys_memfd_secret | ||||
|  | ||||
| @ -368,6 +368,7 @@ | ||||
| 444	common	landlock_create_ruleset	sys_landlock_create_ruleset | ||||
| 445	common	landlock_add_rule	sys_landlock_add_rule | ||||
| 446	common	landlock_restrict_self	sys_landlock_restrict_self | ||||
| 447	common	memfd_secret		sys_memfd_secret | ||||
| 
 | ||||
| # | ||||
| # Due to a historical design error, certain syscalls are numbered differently | ||||
|  | ||||
| @ -1050,6 +1050,7 @@ asmlinkage long sys_landlock_create_ruleset(const struct landlock_ruleset_attr _ | ||||
| asmlinkage long sys_landlock_add_rule(int ruleset_fd, enum landlock_rule_type rule_type, | ||||
| 		const void __user *rule_attr, __u32 flags); | ||||
| asmlinkage long sys_landlock_restrict_self(int ruleset_fd, __u32 flags); | ||||
| asmlinkage long sys_memfd_secret(unsigned int flags); | ||||
| 
 | ||||
| /*
 | ||||
|  * Architecture-specific system calls | ||||
|  | ||||
| @ -873,8 +873,13 @@ __SYSCALL(__NR_landlock_add_rule, sys_landlock_add_rule) | ||||
| #define __NR_landlock_restrict_self 446 | ||||
| __SYSCALL(__NR_landlock_restrict_self, sys_landlock_restrict_self) | ||||
| 
 | ||||
| #ifdef __ARCH_WANT_MEMFD_SECRET | ||||
| #define __NR_memfd_secret 447 | ||||
| __SYSCALL(__NR_memfd_secret, sys_memfd_secret) | ||||
| #endif | ||||
| 
 | ||||
| #undef __NR_syscalls | ||||
| #define __NR_syscalls 447 | ||||
| #define __NR_syscalls 448 | ||||
| 
 | ||||
| /*
 | ||||
|  * 32 bit systems traditionally used different | ||||
|  | ||||
| @ -40,6 +40,10 @@ cat << EOF | ||||
| #define __IGNORE_setrlimit	/* setrlimit */ | ||||
| #endif | ||||
| 
 | ||||
| #ifndef __ARCH_WANT_MEMFD_SECRET | ||||
| #define __IGNORE_memfd_secret | ||||
| #endif | ||||
| 
 | ||||
| /* Missing flags argument */ | ||||
| #define __IGNORE_renameat	/* renameat2 */ | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user