hulk inclusion category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I8YHN7 CVE: NA
-------------------------------------------------
Reserve several syscall entries for kabi compatibility. For arch arm32,ppc32,riscv64,ppc64,arm64,x86_64 currently.
Signed-off-by: Wei Li liwei391@huawei.com --- arch/arm/tools/syscall.tbl | 15 +++++++++ arch/arm64/include/asm/unistd.h | 2 +- arch/arm64/include/asm/unistd32.h | 30 +++++++++++++++++ arch/powerpc/kernel/syscalls/syscall.tbl | 15 +++++++++ arch/x86/entry/syscalls/syscall_32.tbl | 15 +++++++++ arch/x86/entry/syscalls/syscall_64.tbl | 15 +++++++++ include/uapi/asm-generic/unistd.h | 33 ++++++++++++++++++- tools/include/uapi/asm-generic/unistd.h | 33 ++++++++++++++++++- .../arch/powerpc/entry/syscalls/syscall.tbl | 15 +++++++++ .../arch/x86/entry/syscalls/syscall_64.tbl | 15 +++++++++ 10 files changed, 185 insertions(+), 3 deletions(-)
diff --git a/arch/arm/tools/syscall.tbl b/arch/arm/tools/syscall.tbl index 6d494dfbf5e4..235512738edd 100644 --- a/arch/arm/tools/syscall.tbl +++ b/arch/arm/tools/syscall.tbl @@ -467,3 +467,18 @@ 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 453 common map_shadow_stack sys_map_shadow_stack +454 common kabi_reserved454 sys_ni_syscall +455 common kabi_reserved455 sys_ni_syscall +456 common kabi_reserved456 sys_ni_syscall +457 common kabi_reserved457 sys_ni_syscall +458 common kabi_reserved458 sys_ni_syscall +459 common kabi_reserved459 sys_ni_syscall +460 common kabi_reserved460 sys_ni_syscall +461 common kabi_reserved461 sys_ni_syscall +462 common kabi_reserved462 sys_ni_syscall +463 common kabi_reserved463 sys_ni_syscall +464 common kabi_reserved464 sys_ni_syscall +465 common kabi_reserved465 sys_ni_syscall +466 common kabi_reserved466 sys_ni_syscall +467 common kabi_reserved467 sys_ni_syscall +468 common kabi_reserved468 sys_ni_syscall diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index 5e8f788265a2..d24de5bb4777 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@ -44,7 +44,7 @@ #define __ARM_NR_compat_set_tls (__ARM_NR_COMPAT_BASE + 5) #define __ARM_NR_COMPAT_END (__ARM_NR_COMPAT_BASE + 0x800)
-#define __NR_compat_syscalls 454 +#define __NR_compat_syscalls 469 #endif
#define __ARCH_WANT_SYS_CLONE diff --git a/arch/arm64/include/asm/unistd32.h b/arch/arm64/include/asm/unistd32.h index a201d842ec82..e34b07079a5a 100644 --- a/arch/arm64/include/asm/unistd32.h +++ b/arch/arm64/include/asm/unistd32.h @@ -913,6 +913,36 @@ __SYSCALL(__NR_cachestat, sys_cachestat) __SYSCALL(__NR_fchmodat2, sys_fchmodat2) #define __NR_map_shadow_stack 453 __SYSCALL(__NR_map_shadow_stack, sys_map_shadow_stack) +#define __NR_kabi_reserved454 454 +__SYSCALL(__NR_kabi_reserved454, sys_ni_syscall) +#define __NR_kabi_reserved455 455 +__SYSCALL(__NR_kabi_reserved455, sys_ni_syscall) +#define __NR_kabi_reserved456 456 +__SYSCALL(__NR_kabi_reserved456, sys_ni_syscall) +#define __NR_kabi_reserved457 457 +__SYSCALL(__NR_kabi_reserved457, sys_ni_syscall) +#define __NR_kabi_reserved458 458 +__SYSCALL(__NR_kabi_reserved458, sys_ni_syscall) +#define __NR_kabi_reserved459 459 +__SYSCALL(__NR_kabi_reserved459, sys_ni_syscall) +#define __NR_kabi_reserved460 460 +__SYSCALL(__NR_kabi_reserved460, sys_ni_syscall) +#define __NR_kabi_reserved461 461 +__SYSCALL(__NR_kabi_reserved461, sys_ni_syscall) +#define __NR_kabi_reserved462 462 +__SYSCALL(__NR_kabi_reserved462, sys_ni_syscall) +#define __NR_kabi_reserved463 463 +__SYSCALL(__NR_kabi_reserved463, sys_ni_syscall) +#define __NR_kabi_reserved464 464 +__SYSCALL(__NR_kabi_reserved464, sys_ni_syscall) +#define __NR_kabi_reserved465 465 +__SYSCALL(__NR_kabi_reserved465, sys_ni_syscall) +#define __NR_kabi_reserved466 466 +__SYSCALL(__NR_kabi_reserved466, sys_ni_syscall) +#define __NR_kabi_reserved467 467 +__SYSCALL(__NR_kabi_reserved467, sys_ni_syscall) +#define __NR_kabi_reserved468 468 +__SYSCALL(__NR_kabi_reserved468, sys_ni_syscall)
/* * Please add new compat syscalls above this comment and update diff --git a/arch/powerpc/kernel/syscalls/syscall.tbl b/arch/powerpc/kernel/syscalls/syscall.tbl index 87a54acf8346..ce7e5fe2bd32 100644 --- a/arch/powerpc/kernel/syscalls/syscall.tbl +++ b/arch/powerpc/kernel/syscalls/syscall.tbl @@ -540,3 +540,18 @@ 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 453 common map_shadow_stack sys_ni_syscall +454 common kabi_reserved454 sys_ni_syscall +455 common kabi_reserved455 sys_ni_syscall +456 common kabi_reserved456 sys_ni_syscall +457 common kabi_reserved457 sys_ni_syscall +458 common kabi_reserved458 sys_ni_syscall +459 common kabi_reserved459 sys_ni_syscall +460 common kabi_reserved460 sys_ni_syscall +461 common kabi_reserved461 sys_ni_syscall +462 common kabi_reserved462 sys_ni_syscall +463 common kabi_reserved463 sys_ni_syscall +464 common kabi_reserved464 sys_ni_syscall +465 common kabi_reserved465 sys_ni_syscall +466 common kabi_reserved466 sys_ni_syscall +467 common kabi_reserved467 sys_ni_syscall +468 common kabi_reserved468 sys_ni_syscall diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl index 743a7ef5a4b9..f0f250b33043 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@ -458,3 +458,18 @@ 451 i386 cachestat sys_cachestat 452 i386 fchmodat2 sys_fchmodat2 453 i386 map_shadow_stack sys_map_shadow_stack +454 i386 kabi_reserved454 sys_ni_syscall +455 i386 kabi_reserved455 sys_ni_syscall +456 i386 kabi_reserved456 sys_ni_syscall +457 i386 kabi_reserved457 sys_ni_syscall +458 i386 kabi_reserved458 sys_ni_syscall +459 i386 kabi_reserved459 sys_ni_syscall +460 i386 kabi_reserved460 sys_ni_syscall +461 i386 kabi_reserved461 sys_ni_syscall +462 i386 kabi_reserved462 sys_ni_syscall +463 i386 kabi_reserved463 sys_ni_syscall +464 i386 kabi_reserved464 sys_ni_syscall +465 i386 kabi_reserved465 sys_ni_syscall +466 i386 kabi_reserved466 sys_ni_syscall +467 i386 kabi_reserved467 sys_ni_syscall +468 i386 kabi_reserved468 sys_ni_syscall diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl index 1d6eee30eceb..f88268a37ec2 100644 --- a/arch/x86/entry/syscalls/syscall_64.tbl +++ b/arch/x86/entry/syscalls/syscall_64.tbl @@ -375,6 +375,21 @@ 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 453 64 map_shadow_stack sys_map_shadow_stack +454 common kabi_reserved454 sys_ni_syscall +455 common kabi_reserved455 sys_ni_syscall +456 common kabi_reserved456 sys_ni_syscall +457 common kabi_reserved457 sys_ni_syscall +458 common kabi_reserved458 sys_ni_syscall +459 common kabi_reserved459 sys_ni_syscall +460 common kabi_reserved460 sys_ni_syscall +461 common kabi_reserved461 sys_ni_syscall +462 common kabi_reserved462 sys_ni_syscall +463 common kabi_reserved463 sys_ni_syscall +464 common kabi_reserved464 sys_ni_syscall +465 common kabi_reserved465 sys_ni_syscall +466 common kabi_reserved466 sys_ni_syscall +467 common kabi_reserved467 sys_ni_syscall +468 common kabi_reserved468 sys_ni_syscall
# # Due to a historical design error, certain syscalls are numbered differently diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index 203ae30d7761..682a1e263c4a 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -826,8 +826,39 @@ __SYSCALL(__NR_fchmodat2, sys_fchmodat2) #define __NR_map_shadow_stack 453 __SYSCALL(__NR_map_shadow_stack, sys_map_shadow_stack)
+#define __NR_kabi_reserved454 454 +__SYSCALL(__NR_kabi_reserved454, sys_ni_syscall) +#define __NR_kabi_reserved455 455 +__SYSCALL(__NR_kabi_reserved455, sys_ni_syscall) +#define __NR_kabi_reserved456 456 +__SYSCALL(__NR_kabi_reserved456, sys_ni_syscall) +#define __NR_kabi_reserved457 457 +__SYSCALL(__NR_kabi_reserved457, sys_ni_syscall) +#define __NR_kabi_reserved458 458 +__SYSCALL(__NR_kabi_reserved458, sys_ni_syscall) +#define __NR_kabi_reserved459 459 +__SYSCALL(__NR_kabi_reserved459, sys_ni_syscall) +#define __NR_kabi_reserved460 460 +__SYSCALL(__NR_kabi_reserved460, sys_ni_syscall) +#define __NR_kabi_reserved461 461 +__SYSCALL(__NR_kabi_reserved461, sys_ni_syscall) +#define __NR_kabi_reserved462 462 +__SYSCALL(__NR_kabi_reserved462, sys_ni_syscall) +#define __NR_kabi_reserved463 463 +__SYSCALL(__NR_kabi_reserved463, sys_ni_syscall) +#define __NR_kabi_reserved464 464 +__SYSCALL(__NR_kabi_reserved464, sys_ni_syscall) +#define __NR_kabi_reserved465 465 +__SYSCALL(__NR_kabi_reserved465, sys_ni_syscall) +#define __NR_kabi_reserved466 466 +__SYSCALL(__NR_kabi_reserved466, sys_ni_syscall) +#define __NR_kabi_reserved467 467 +__SYSCALL(__NR_kabi_reserved467, sys_ni_syscall) +#define __NR_kabi_reserved468 468 +__SYSCALL(__NR_kabi_reserved468, sys_ni_syscall) + #undef __NR_syscalls -#define __NR_syscalls 454 +#define __NR_syscalls 469
/* * 32 bit systems traditionally used different diff --git a/tools/include/uapi/asm-generic/unistd.h b/tools/include/uapi/asm-generic/unistd.h index dd2682767808..7cae265fefba 100644 --- a/tools/include/uapi/asm-generic/unistd.h +++ b/tools/include/uapi/asm-generic/unistd.h @@ -823,8 +823,39 @@ __SYSCALL(__NR_fchmodat2, sys_fchmodat2) #define __NR_map_shadow_stack 453 __SYSCALL(__NR_map_shadow_stack, sys_map_shadow_stack)
+#define __NR_kabi_reserved454 454 +__SYSCALL(__NR_kabi_reserved454, sys_ni_syscall) +#define __NR_kabi_reserved455 455 +__SYSCALL(__NR_kabi_reserved455, sys_ni_syscall) +#define __NR_kabi_reserved456 456 +__SYSCALL(__NR_kabi_reserved456, sys_ni_syscall) +#define __NR_kabi_reserved457 457 +__SYSCALL(__NR_kabi_reserved457, sys_ni_syscall) +#define __NR_kabi_reserved458 458 +__SYSCALL(__NR_kabi_reserved458, sys_ni_syscall) +#define __NR_kabi_reserved459 459 +__SYSCALL(__NR_kabi_reserved459, sys_ni_syscall) +#define __NR_kabi_reserved460 460 +__SYSCALL(__NR_kabi_reserved460, sys_ni_syscall) +#define __NR_kabi_reserved461 461 +__SYSCALL(__NR_kabi_reserved461, sys_ni_syscall) +#define __NR_kabi_reserved462 462 +__SYSCALL(__NR_kabi_reserved462, sys_ni_syscall) +#define __NR_kabi_reserved463 463 +__SYSCALL(__NR_kabi_reserved463, sys_ni_syscall) +#define __NR_kabi_reserved464 464 +__SYSCALL(__NR_kabi_reserved464, sys_ni_syscall) +#define __NR_kabi_reserved465 465 +__SYSCALL(__NR_kabi_reserved465, sys_ni_syscall) +#define __NR_kabi_reserved466 466 +__SYSCALL(__NR_kabi_reserved466, sys_ni_syscall) +#define __NR_kabi_reserved467 467 +__SYSCALL(__NR_kabi_reserved467, sys_ni_syscall) +#define __NR_kabi_reserved468 468 +__SYSCALL(__NR_kabi_reserved468, sys_ni_syscall) + #undef __NR_syscalls -#define __NR_syscalls 454 +#define __NR_syscalls 469
/* * 32 bit systems traditionally used different diff --git a/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl b/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl index 87a54acf8346..ce7e5fe2bd32 100644 --- a/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +++ b/tools/perf/arch/powerpc/entry/syscalls/syscall.tbl @@ -540,3 +540,18 @@ 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 453 common map_shadow_stack sys_ni_syscall +454 common kabi_reserved454 sys_ni_syscall +455 common kabi_reserved455 sys_ni_syscall +456 common kabi_reserved456 sys_ni_syscall +457 common kabi_reserved457 sys_ni_syscall +458 common kabi_reserved458 sys_ni_syscall +459 common kabi_reserved459 sys_ni_syscall +460 common kabi_reserved460 sys_ni_syscall +461 common kabi_reserved461 sys_ni_syscall +462 common kabi_reserved462 sys_ni_syscall +463 common kabi_reserved463 sys_ni_syscall +464 common kabi_reserved464 sys_ni_syscall +465 common kabi_reserved465 sys_ni_syscall +466 common kabi_reserved466 sys_ni_syscall +467 common kabi_reserved467 sys_ni_syscall +468 common kabi_reserved468 sys_ni_syscall diff --git a/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl b/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl index 1d6eee30eceb..f88268a37ec2 100644 --- a/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +++ b/tools/perf/arch/x86/entry/syscalls/syscall_64.tbl @@ -375,6 +375,21 @@ 451 common cachestat sys_cachestat 452 common fchmodat2 sys_fchmodat2 453 64 map_shadow_stack sys_map_shadow_stack +454 common kabi_reserved454 sys_ni_syscall +455 common kabi_reserved455 sys_ni_syscall +456 common kabi_reserved456 sys_ni_syscall +457 common kabi_reserved457 sys_ni_syscall +458 common kabi_reserved458 sys_ni_syscall +459 common kabi_reserved459 sys_ni_syscall +460 common kabi_reserved460 sys_ni_syscall +461 common kabi_reserved461 sys_ni_syscall +462 common kabi_reserved462 sys_ni_syscall +463 common kabi_reserved463 sys_ni_syscall +464 common kabi_reserved464 sys_ni_syscall +465 common kabi_reserved465 sys_ni_syscall +466 common kabi_reserved466 sys_ni_syscall +467 common kabi_reserved467 sys_ni_syscall +468 common kabi_reserved468 sys_ni_syscall
# # Due to a historical design error, certain syscalls are numbered differently