diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-31 11:04:39 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-31 11:04:39 +0100 |
| commit | 4ca24c3b9f9a828d7c951844ceec88e8699550ad (patch) | |
| tree | 8e5e934452d19558913c147166d0379ee718d61f /0002-arch-wire-up-the-readfile-syscall.patch | |
| parent | 5a4549f7ebf22787b2a76908ba90598e453d4a15 (diff) | |
| download | patches-4ca24c3b9f9a828d7c951844ceec88e8699550ad.tar.gz | |
update patches based on 5.11-rc1
Diffstat (limited to '0002-arch-wire-up-the-readfile-syscall.patch')
| -rw-r--r-- | 0002-arch-wire-up-the-readfile-syscall.patch | 199 |
1 files changed, 79 insertions, 120 deletions
diff --git a/0002-arch-wire-up-the-readfile-syscall.patch b/0002-arch-wire-up-the-readfile-syscall.patch index d1b4a3b933d9b2..489a85ce3b4c68 100644 --- a/0002-arch-wire-up-the-readfile-syscall.patch +++ b/0002-arch-wire-up-the-readfile-syscall.patch @@ -1,4 +1,4 @@ -From 39b066fa7c6b33fffe445e2201f19a6740b4fbc2 Mon Sep 17 00:00:00 2001 +From 7cb89db31b533823719673c881acb19d6b879f98 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Date: Sun, 24 May 2020 12:36:21 +0200 Subject: [PATCH 2/4] arch: wire up the readfile syscall @@ -7,192 +7,156 @@ This wires up the readfile syscall for all architectures Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- - arch/alpha/kernel/syscalls/syscall.tbl | 1 + - arch/arm/tools/syscall.tbl | 1 + - arch/arm64/include/asm/unistd32.h | 2 ++ - arch/ia64/kernel/syscalls/syscall.tbl | 1 + - arch/m68k/kernel/syscalls/syscall.tbl | 1 + - arch/microblaze/kernel/syscalls/syscall.tbl | 1 + - arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + - arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + - arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + - arch/parisc/kernel/syscalls/syscall.tbl | 1 + - arch/powerpc/kernel/syscalls/syscall.tbl | 1 + - arch/s390/kernel/syscalls/syscall.tbl | 1 + - arch/sh/kernel/syscalls/syscall.tbl | 1 + - arch/sparc/kernel/syscalls/syscall.tbl | 1 + - arch/x86/entry/syscalls/syscall_32.tbl | 1 + - arch/x86/entry/syscalls/syscall_64.tbl | 1 + - arch/xtensa/kernel/syscalls/syscall.tbl | 1 + - include/linux/syscalls.h | 2 ++ - include/uapi/asm-generic/unistd.h | 4 +++- + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd32.h | 2 ++ + arch/ia64/kernel/syscalls/syscall.tbl | 1 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + include/linux/syscalls.h | 2 ++ + include/uapi/asm-generic/unistd.h | 4 +++- 19 files changed, 23 insertions(+), 1 deletion(-) -diff --git a/arch/alpha/kernel/syscalls/syscall.tbl b/arch/alpha/kernel/syscalls/syscall.tbl -index ee7b01bb7346..9665012486e7 100644 --- a/arch/alpha/kernel/syscalls/syscall.tbl +++ b/arch/alpha/kernel/syscalls/syscall.tbl -@@ -480,3 +480,4 @@ - 548 common pidfd_getfd sys_pidfd_getfd +@@ -481,3 +481,4 @@ 549 common faccessat2 sys_faccessat2 550 common process_madvise sys_process_madvise -+551 common readfile sys_readfile -diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl -index d056a548358e..88acc17373bb 100644 + 551 common epoll_pwait2 sys_epoll_pwait2 ++552 common readfile sys_readfile --- a/arch/arm/tools/syscall.tbl +++ b/arch/arm/tools/syscall.tbl -@@ -454,3 +454,4 @@ - 438 common pidfd_getfd sys_pidfd_getfd +@@ -455,3 +455,4 @@ 439 common faccessat2 sys_faccessat2 440 common process_madvise sys_process_madvise -+441 common readfile sys_readfile -diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h -index 107f08e03b9f..b92b3e3fac18 100644 + 441 common epoll_pwait2 sys_epoll_pwait2 ++442 common readfile sys_readfile --- a/arch/arm64/include/asm/unistd32.h +++ b/arch/arm64/include/asm/unistd32.h -@@ -889,6 +889,8 @@ __SYSCALL(__NR_pidfd_getfd, sys_pidfd_getfd) - __SYSCALL(__NR_faccessat2, sys_faccessat2) - #define __NR_process_madvise 440 +@@ -891,6 +891,8 @@ __SYSCALL(__NR_faccessat2, sys_faccessat __SYSCALL(__NR_process_madvise, sys_process_madvise) -+#define __NR_readfile 441 + #define __NR_epoll_pwait2 441 + __SYSCALL(__NR_epoll_pwait2, compat_sys_epoll_pwait2) ++#define __NR_readfile 442 +__SYSCALL(__NR_readfile, sys_readfile) /* * Please add new compat syscalls above this comment and update -diff --git a/arch/ia64/kernel/syscalls/syscall.tbl b/arch/ia64/kernel/syscalls/syscall.tbl -index b96ed8b8a508..ad5e62125858 100644 --- a/arch/ia64/kernel/syscalls/syscall.tbl +++ b/arch/ia64/kernel/syscalls/syscall.tbl -@@ -361,3 +361,4 @@ - 438 common pidfd_getfd sys_pidfd_getfd +@@ -362,3 +362,4 @@ 439 common faccessat2 sys_faccessat2 440 common process_madvise sys_process_madvise -+441 common readfile sys_readfile -diff --git a/arch/m68k/kernel/syscalls/syscall.tbl b/arch/m68k/kernel/syscalls/syscall.tbl -index 625fb6d32842..fbe539d66af9 100644 + 441 common epoll_pwait2 sys_epoll_pwait2 ++442 common readfile sys_readfile --- a/arch/m68k/kernel/syscalls/syscall.tbl +++ b/arch/m68k/kernel/syscalls/syscall.tbl -@@ -440,3 +440,4 @@ - 438 common pidfd_getfd sys_pidfd_getfd +@@ -441,3 +441,4 @@ 439 common faccessat2 sys_faccessat2 440 common process_madvise sys_process_madvise -+441 common readfile sys_readfile -diff --git a/arch/microblaze/kernel/syscalls/syscall.tbl b/arch/microblaze/kernel/syscalls/syscall.tbl -index aae729c95cf9..e0a7084f2128 100644 + 441 common epoll_pwait2 sys_epoll_pwait2 ++442 common readfile sys_readfile --- a/arch/microblaze/kernel/syscalls/syscall.tbl +++ b/arch/microblaze/kernel/syscalls/syscall.tbl -@@ -446,3 +446,4 @@ - 438 common pidfd_getfd sys_pidfd_getfd +@@ -447,3 +447,4 @@ 439 common faccessat2 sys_faccessat2 440 common process_madvise sys_process_madvise -+441 common readfile sys_readfile -diff --git a/arch/mips/kernel/syscalls/syscall_n32.tbl b/arch/mips/kernel/syscalls/syscall_n32.tbl -index 32817c954435..9e3bbd44e277 100644 + 441 common epoll_pwait2 sys_epoll_pwait2 ++442 common readfile sys_readfile --- a/arch/mips/kernel/syscalls/syscall_n32.tbl +++ b/arch/mips/kernel/syscalls/syscall_n32.tbl -@@ -379,3 +379,4 @@ - 438 n32 pidfd_getfd sys_pidfd_getfd +@@ -380,3 +380,4 @@ 439 n32 faccessat2 sys_faccessat2 440 n32 process_madvise sys_process_madvise -+441 n32 readfile sys_readfile -diff --git a/arch/mips/kernel/syscalls/syscall_n64.tbl b/arch/mips/kernel/syscalls/syscall_n64.tbl -index 9e4ea3c31b1c..efa890ff2d6d 100644 + 441 n32 epoll_pwait2 compat_sys_epoll_pwait2 ++442 n32 readfile sys_readfile --- a/arch/mips/kernel/syscalls/syscall_n64.tbl +++ b/arch/mips/kernel/syscalls/syscall_n64.tbl -@@ -355,3 +355,4 @@ - 438 n64 pidfd_getfd sys_pidfd_getfd +@@ -356,3 +356,4 @@ 439 n64 faccessat2 sys_faccessat2 440 n64 process_madvise sys_process_madvise -+441 n64 readfile sys_readfile -diff --git a/arch/mips/kernel/syscalls/syscall_o32.tbl b/arch/mips/kernel/syscalls/syscall_o32.tbl -index 29f5f28cf5ce..68b48d230657 100644 + 441 n64 epoll_pwait2 sys_epoll_pwait2 ++442 n64 readfile sys_readfile --- a/arch/mips/kernel/syscalls/syscall_o32.tbl +++ b/arch/mips/kernel/syscalls/syscall_o32.tbl -@@ -428,3 +428,4 @@ - 438 o32 pidfd_getfd sys_pidfd_getfd +@@ -429,3 +429,4 @@ 439 o32 faccessat2 sys_faccessat2 440 o32 process_madvise sys_process_madvise -+441 o32 readfile sys_readfile -diff --git a/arch/parisc/kernel/syscalls/syscall.tbl b/arch/parisc/kernel/syscalls/syscall.tbl -index f375ea528e59..ea0b323b9af3 100644 + 441 o32 epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2 ++442 o32 readfile sys_readfile --- a/arch/parisc/kernel/syscalls/syscall.tbl +++ b/arch/parisc/kernel/syscalls/syscall.tbl -@@ -438,3 +438,4 @@ - 438 common pidfd_getfd sys_pidfd_getfd +@@ -439,3 +439,4 @@ 439 common faccessat2 sys_faccessat2 440 common process_madvise sys_process_madvise -+441 common readfile sys_readfile -diff --git a/arch/powerpc/kernel/syscalls/syscall.tbl b/arch/powerpc/kernel/syscalls/syscall.tbl -index 1275daec7fec..15ace3e8e99c 100644 + 441 common epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2 ++442 common readfile sys_readfile --- a/arch/powerpc/kernel/syscalls/syscall.tbl +++ b/arch/powerpc/kernel/syscalls/syscall.tbl -@@ -530,3 +530,4 @@ - 438 common pidfd_getfd sys_pidfd_getfd +@@ -531,3 +531,4 @@ 439 common faccessat2 sys_faccessat2 440 common process_madvise sys_process_madvise -+441 common readfile sys_readfile -diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/syscalls/syscall.tbl -index 28c168000483..7e80ef92ef96 100644 + 441 common epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2 ++442 common readfile sys_readfile --- a/arch/s390/kernel/syscalls/syscall.tbl +++ b/arch/s390/kernel/syscalls/syscall.tbl -@@ -443,3 +443,4 @@ - 438 common pidfd_getfd sys_pidfd_getfd sys_pidfd_getfd +@@ -444,3 +444,4 @@ 439 common faccessat2 sys_faccessat2 sys_faccessat2 440 common process_madvise sys_process_madvise sys_process_madvise -+441 common readfile sys_readfile sys_readfile -diff --git a/arch/sh/kernel/syscalls/syscall.tbl b/arch/sh/kernel/syscalls/syscall.tbl -index 783738448ff5..56a6b3030733 100644 + 441 common epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2 ++442 common readfile sys_readfile sys_readfile --- a/arch/sh/kernel/syscalls/syscall.tbl +++ b/arch/sh/kernel/syscalls/syscall.tbl -@@ -443,3 +443,4 @@ - 438 common pidfd_getfd sys_pidfd_getfd +@@ -444,3 +444,4 @@ 439 common faccessat2 sys_faccessat2 440 common process_madvise sys_process_madvise -+441 common readfile sys_readfile -diff --git a/arch/sparc/kernel/syscalls/syscall.tbl b/arch/sparc/kernel/syscalls/syscall.tbl -index 78160260991b..a14c1690fae5 100644 + 441 common epoll_pwait2 sys_epoll_pwait2 ++442 common readfile sys_readfile --- a/arch/sparc/kernel/syscalls/syscall.tbl +++ b/arch/sparc/kernel/syscalls/syscall.tbl -@@ -486,3 +486,4 @@ - 438 common pidfd_getfd sys_pidfd_getfd +@@ -487,3 +487,4 @@ 439 common faccessat2 sys_faccessat2 440 common process_madvise sys_process_madvise -+441 common readfile sys_readfile -diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl -index 0d0667a9fbd7..c50df8220baf 100644 + 441 common epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2 ++442 common readfile sys_readfile --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl -@@ -445,3 +445,4 @@ - 438 i386 pidfd_getfd sys_pidfd_getfd +@@ -446,3 +446,4 @@ 439 i386 faccessat2 sys_faccessat2 440 i386 process_madvise sys_process_madvise -+441 i386 readfile sys_readfile -diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl -index 379819244b91..c2d57fca0bd8 100644 + 441 i386 epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2 ++442 i386 readfile sys_readfile --- a/arch/x86/entry/syscalls/syscall_64.tbl +++ b/arch/x86/entry/syscalls/syscall_64.tbl -@@ -362,6 +362,7 @@ - 438 common pidfd_getfd sys_pidfd_getfd +@@ -363,6 +363,7 @@ 439 common faccessat2 sys_faccessat2 440 common process_madvise sys_process_madvise -+441 common readfile sys_readfile + 441 common epoll_pwait2 sys_epoll_pwait2 ++442 common readfile sys_readfile # # Due to a historical design error, certain syscalls are numbered differently -diff --git a/arch/xtensa/kernel/syscalls/syscall.tbl b/arch/xtensa/kernel/syscalls/syscall.tbl -index b070f272995d..db4a5e18ecc8 100644 --- a/arch/xtensa/kernel/syscalls/syscall.tbl +++ b/arch/xtensa/kernel/syscalls/syscall.tbl -@@ -411,3 +411,4 @@ - 438 common pidfd_getfd sys_pidfd_getfd +@@ -412,3 +412,4 @@ 439 common faccessat2 sys_faccessat2 440 common process_madvise sys_process_madvise -+441 common readfile sys_readfile -diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h -index 37bea07c12f2..653d3a3ad1c4 100644 + 441 common epoll_pwait2 sys_epoll_pwait2 ++442 common readfile sys_readfile --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h -@@ -1008,6 +1008,8 @@ asmlinkage long sys_pidfd_send_signal(int pidfd, int sig, +@@ -1013,6 +1013,8 @@ asmlinkage long sys_pidfd_send_signal(in siginfo_t __user *info, unsigned int flags); asmlinkage long sys_pidfd_getfd(int pidfd, int fd, unsigned int flags); @@ -201,23 +165,18 @@ index 37bea07c12f2..653d3a3ad1c4 100644 /* * Architecture-specific system calls -diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h -index 2056318988f7..7a0bee36e0a7 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h -@@ -859,9 +859,11 @@ __SYSCALL(__NR_pidfd_getfd, sys_pidfd_getfd) - __SYSCALL(__NR_faccessat2, sys_faccessat2) - #define __NR_process_madvise 440 +@@ -861,9 +861,11 @@ __SYSCALL(__NR_faccessat2, sys_faccessat __SYSCALL(__NR_process_madvise, sys_process_madvise) -+#define __NR_readfile 441 + #define __NR_epoll_pwait2 441 + __SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2) ++#define __NR_readfile 442 +__SYSCALL(__NR_readfile, sys_readfile) #undef __NR_syscalls --#define __NR_syscalls 441 -+#define __NR_syscalls 442 +-#define __NR_syscalls 442 ++#define __NR_syscalls 443 /* * 32 bit systems traditionally used different --- -2.29.2 - |