diff options
Diffstat (limited to '0002-arch-wire-up-the-readfile-syscall.patch')
| -rw-r--r-- | 0002-arch-wire-up-the-readfile-syscall.patch | 211 |
1 files changed, 123 insertions, 88 deletions
diff --git a/0002-arch-wire-up-the-readfile-syscall.patch b/0002-arch-wire-up-the-readfile-syscall.patch index c8a78c94d3733a..690704f636f386 100644 --- a/0002-arch-wire-up-the-readfile-syscall.patch +++ b/0002-arch-wire-up-the-readfile-syscall.patch @@ -1,4 +1,4 @@ -From b1c4dc1ba255fb1eac6f11532bdb8d41173624df Mon Sep 17 00:00:00 2001 +From 2769ff130aa11ba1b9194fe4b9c06d0ae5f8dfda Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Date: Wed, 10 Aug 2022 13:07:37 +0200 Subject: [PATCH 2/4] arch: wire up the readfile syscall @@ -7,138 +7,168 @@ This wires up the readfile syscall for all architectures Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- - arch/alpha/kernel/syscalls/syscall.tbl | 2 ++ - arch/arm/tools/syscall.tbl | 1 + - arch/m68k/kernel/syscalls/syscall.tbl | 1 + - arch/microblaze/kernel/syscalls/syscall.tbl | 1 + - arch/mips/kernel/syscalls/syscall_n32.tbl | 2 ++ - 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 | 5 ++++- - 17 files changed, 23 insertions(+), 1 deletion(-) + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/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 | 5 ++++- + 17 files changed, 21 insertions(+), 1 deletion(-) +diff --git a/arch/alpha/kernel/syscalls/syscall.tbl b/arch/alpha/kernel/syscalls/syscall.tbl +index 16dca28ebf17..21282c0546eb 100644 --- a/arch/alpha/kernel/syscalls/syscall.tbl +++ b/arch/alpha/kernel/syscalls/syscall.tbl -@@ -507,3 +507,5 @@ - 575 common listxattrat sys_listxattrat - 576 common removexattrat sys_removexattrat +@@ -509,3 +509,4 @@ 577 common open_tree_attr sys_open_tree_attr -+578 common readfile sys_readfile -+ + 578 common file_getattr sys_file_getattr + 579 common file_setattr sys_file_setattr ++580 common readfile sys_readfile +diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl +index b07e699aaa3c..a7a158155655 100644 --- a/arch/arm/tools/syscall.tbl +++ b/arch/arm/tools/syscall.tbl -@@ -482,3 +482,4 @@ - 465 common listxattrat sys_listxattrat - 466 common removexattrat sys_removexattrat +@@ -484,3 +484,4 @@ 467 common open_tree_attr sys_open_tree_attr -+468 common readfile sys_readfile + 468 common file_getattr sys_file_getattr + 469 common file_setattr sys_file_setattr ++470 common readfile sys_readfile +diff --git a/arch/m68k/kernel/syscalls/syscall.tbl b/arch/m68k/kernel/syscalls/syscall.tbl +index f41d38dfbf13..c91c6846c619 100644 --- a/arch/m68k/kernel/syscalls/syscall.tbl +++ b/arch/m68k/kernel/syscalls/syscall.tbl -@@ -467,3 +467,4 @@ - 465 common listxattrat sys_listxattrat - 466 common removexattrat sys_removexattrat +@@ -469,3 +469,4 @@ 467 common open_tree_attr sys_open_tree_attr -+468 common readfile sys_readfile + 468 common file_getattr sys_file_getattr + 469 common file_setattr sys_file_setattr ++470 common readfile sys_readfile +diff --git a/arch/microblaze/kernel/syscalls/syscall.tbl b/arch/microblaze/kernel/syscalls/syscall.tbl +index 580af574fe73..d4fb48f497c5 100644 --- a/arch/microblaze/kernel/syscalls/syscall.tbl +++ b/arch/microblaze/kernel/syscalls/syscall.tbl -@@ -473,3 +473,4 @@ - 465 common listxattrat sys_listxattrat - 466 common removexattrat sys_removexattrat +@@ -475,3 +475,4 @@ 467 common open_tree_attr sys_open_tree_attr -+468 common readfile sys_readfile + 468 common file_getattr sys_file_getattr + 469 common file_setattr sys_file_setattr ++470 common readfile sys_readfile +diff --git a/arch/mips/kernel/syscalls/syscall_n32.tbl b/arch/mips/kernel/syscalls/syscall_n32.tbl +index d824ffe9a014..7749bc101906 100644 --- a/arch/mips/kernel/syscalls/syscall_n32.tbl +++ b/arch/mips/kernel/syscalls/syscall_n32.tbl -@@ -406,3 +406,5 @@ - 465 n32 listxattrat sys_listxattrat - 466 n32 removexattrat sys_removexattrat +@@ -408,3 +408,4 @@ 467 n32 open_tree_attr sys_open_tree_attr -+468 n32 readfile sys_readfile -+ + 468 n32 file_getattr sys_file_getattr + 469 n32 file_setattr sys_file_setattr ++470 n32 readfile sys_readfile +diff --git a/arch/mips/kernel/syscalls/syscall_n64.tbl b/arch/mips/kernel/syscalls/syscall_n64.tbl +index 7a7049c2c307..6f7cf70c6b96 100644 --- a/arch/mips/kernel/syscalls/syscall_n64.tbl +++ b/arch/mips/kernel/syscalls/syscall_n64.tbl -@@ -382,3 +382,4 @@ - 465 n64 listxattrat sys_listxattrat - 466 n64 removexattrat sys_removexattrat +@@ -384,3 +384,4 @@ 467 n64 open_tree_attr sys_open_tree_attr -+468 n64 readfile sys_readfile + 468 n64 file_getattr sys_file_getattr + 469 n64 file_setattr sys_file_setattr ++470 n64 readfile sys_readfile +diff --git a/arch/mips/kernel/syscalls/syscall_o32.tbl b/arch/mips/kernel/syscalls/syscall_o32.tbl +index d330274f0601..fae6f31ff78c 100644 --- a/arch/mips/kernel/syscalls/syscall_o32.tbl +++ b/arch/mips/kernel/syscalls/syscall_o32.tbl -@@ -455,3 +455,4 @@ - 465 o32 listxattrat sys_listxattrat - 466 o32 removexattrat sys_removexattrat +@@ -457,3 +457,4 @@ 467 o32 open_tree_attr sys_open_tree_attr -+468 o32 readfile sys_readfile + 468 o32 file_getattr sys_file_getattr + 469 o32 file_setattr sys_file_setattr ++470 o32 readfile sys_readfile +diff --git a/arch/parisc/kernel/syscalls/syscall.tbl b/arch/parisc/kernel/syscalls/syscall.tbl +index 88a788a7b18d..ddae31f635ed 100644 --- a/arch/parisc/kernel/syscalls/syscall.tbl +++ b/arch/parisc/kernel/syscalls/syscall.tbl -@@ -466,3 +466,4 @@ - 465 common listxattrat sys_listxattrat - 466 common removexattrat sys_removexattrat +@@ -468,3 +468,4 @@ 467 common open_tree_attr sys_open_tree_attr -+468 common readfile sys_readfile + 468 common file_getattr sys_file_getattr + 469 common file_setattr sys_file_setattr ++470 common readfile sys_readfile +diff --git a/arch/powerpc/kernel/syscalls/syscall.tbl b/arch/powerpc/kernel/syscalls/syscall.tbl +index b453e80dfc00..be0389c42004 100644 --- a/arch/powerpc/kernel/syscalls/syscall.tbl +++ b/arch/powerpc/kernel/syscalls/syscall.tbl -@@ -558,3 +558,4 @@ - 465 common listxattrat sys_listxattrat - 466 common removexattrat sys_removexattrat +@@ -560,3 +560,4 @@ 467 common open_tree_attr sys_open_tree_attr -+468 common readfile sys_readfile + 468 common file_getattr sys_file_getattr + 469 common file_setattr sys_file_setattr ++470 common readfile sys_readfile +diff --git a/arch/s390/kernel/syscalls/syscall.tbl b/arch/s390/kernel/syscalls/syscall.tbl +index 8a6744d658db..fe5306fd920a 100644 --- a/arch/s390/kernel/syscalls/syscall.tbl +++ b/arch/s390/kernel/syscalls/syscall.tbl -@@ -470,3 +470,4 @@ - 465 common listxattrat sys_listxattrat sys_listxattrat - 466 common removexattrat sys_removexattrat sys_removexattrat +@@ -472,3 +472,4 @@ 467 common open_tree_attr sys_open_tree_attr sys_open_tree_attr -+468 common readfile sys_readfile sys_readfile + 468 common file_getattr sys_file_getattr sys_file_getattr + 469 common file_setattr sys_file_setattr sys_file_setattr ++470 common readfile sys_readfile sys_readfile +diff --git a/arch/sh/kernel/syscalls/syscall.tbl b/arch/sh/kernel/syscalls/syscall.tbl +index 5e9c9eff5539..7a1eda4ff9b7 100644 --- a/arch/sh/kernel/syscalls/syscall.tbl +++ b/arch/sh/kernel/syscalls/syscall.tbl -@@ -471,3 +471,4 @@ - 465 common listxattrat sys_listxattrat - 466 common removexattrat sys_removexattrat +@@ -473,3 +473,4 @@ 467 common open_tree_attr sys_open_tree_attr -+468 common readfile sys_readfile + 468 common file_getattr sys_file_getattr + 469 common file_setattr sys_file_setattr ++470 common readfile sys_readfile +diff --git a/arch/sparc/kernel/syscalls/syscall.tbl b/arch/sparc/kernel/syscalls/syscall.tbl +index ebb7d06d1044..b4b7d7d31072 100644 --- a/arch/sparc/kernel/syscalls/syscall.tbl +++ b/arch/sparc/kernel/syscalls/syscall.tbl -@@ -513,3 +513,4 @@ - 465 common listxattrat sys_listxattrat - 466 common removexattrat sys_removexattrat +@@ -515,3 +515,4 @@ 467 common open_tree_attr sys_open_tree_attr -+468 common readfile sys_readfile + 468 common file_getattr sys_file_getattr + 469 common file_setattr sys_file_setattr ++470 common readfile sys_readfile +diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl +index 4877e16da69a..54fadd106f39 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl -@@ -473,3 +473,4 @@ - 465 i386 listxattrat sys_listxattrat - 466 i386 removexattrat sys_removexattrat +@@ -475,3 +475,4 @@ 467 i386 open_tree_attr sys_open_tree_attr -+468 i386 readfile sys_readfile + 468 i386 file_getattr sys_file_getattr + 469 i386 file_setattr sys_file_setattr ++470 i386 readfile sys_readfile +diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl +index ced2a1deecd7..a724926aa60c 100644 --- a/arch/x86/entry/syscalls/syscall_64.tbl +++ b/arch/x86/entry/syscalls/syscall_64.tbl -@@ -391,6 +391,7 @@ - 465 common listxattrat sys_listxattrat - 466 common removexattrat sys_removexattrat +@@ -394,6 +394,7 @@ 467 common open_tree_attr sys_open_tree_attr -+468 common readfile sys_readfile + 468 common file_getattr sys_file_getattr + 469 common file_setattr sys_file_setattr ++470 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 374e4cb788d8..8366c5885f16 100644 --- a/arch/xtensa/kernel/syscalls/syscall.tbl +++ b/arch/xtensa/kernel/syscalls/syscall.tbl -@@ -438,3 +438,4 @@ - 465 common listxattrat sys_listxattrat - 466 common removexattrat sys_removexattrat +@@ -440,3 +440,4 @@ 467 common open_tree_attr sys_open_tree_attr -+468 common readfile sys_readfile + 468 common file_getattr sys_file_getattr + 469 common file_setattr sys_file_setattr ++470 common readfile sys_readfile +diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h +index 66c06fcdfe19..8bb49fd00569 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h -@@ -988,6 +988,8 @@ asmlinkage long sys_lsm_get_self_attr(un +@@ -995,6 +995,8 @@ asmlinkage long sys_lsm_get_self_attr(unsigned int attr, struct lsm_ctx __user * asmlinkage long sys_lsm_set_self_attr(unsigned int attr, struct lsm_ctx __user *ctx, u32 size, u32 flags); asmlinkage long sys_lsm_list_modules(u64 __user *ids, u32 __user *size, u32 flags); @@ -147,18 +177,23 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> /* * Architecture-specific system calls +diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h +index 04e0077fb4c9..7f0f7c3e30d7 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h -@@ -852,8 +852,11 @@ __SYSCALL(__NR_removexattrat, sys_remove - #define __NR_open_tree_attr 467 - __SYSCALL(__NR_open_tree_attr, sys_open_tree_attr) +@@ -858,8 +858,11 @@ __SYSCALL(__NR_file_getattr, sys_file_getattr) + #define __NR_file_setattr 469 + __SYSCALL(__NR_file_setattr, sys_file_setattr) -+#define __NR_readfile 468 ++#define __NR_readfile 470 +__SYSCALL(__NR_readfile, sys_readfile) + #undef __NR_syscalls --#define __NR_syscalls 468 -+#define __NR_syscalls 469 +-#define __NR_syscalls 470 ++#define __NR_syscalls 471 /* * 32 bit systems traditionally used different +-- +2.52.0 + |