Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame^] | 1 | From 28b9f115e36e2133301b02fa02ad71a8efbed9b9 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 2 | From: Joe Slater <jslater@windriver.com> |
| 3 | Date: Thu, 9 Mar 2017 10:58:06 -0800 |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame] | 4 | Subject: [PATCH] chrony: fix build failure for arma9 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5 | |
Brad Bishop | 7f28bc5 | 2017-12-03 23:42:40 -0500 | [diff] [blame] | 6 | Eliminate references to syscalls not available |
| 7 | for ARM_EABI. Also add a dependency on libseccomp |
| 8 | which is needed for scfilter to work. |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 9 | |
Brad Bishop | 7f28bc5 | 2017-12-03 23:42:40 -0500 | [diff] [blame] | 10 | Set PACKAGECONFIG to not enable scfilter, since |
| 11 | kernel CONFIG_SECCOMP is unlikely to be set. This |
| 12 | aligns the usage of libseccomp with that of other packages. |
| 13 | |
| 14 | Upstream-Status: Pending |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 15 | |
Brad Bishop | 7f28bc5 | 2017-12-03 23:42:40 -0500 | [diff] [blame] | 16 | Signed-off-by: Joe Slater <jslater@windriver.com> |
| 17 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 18 | Refresh patch for new upstream version. |
| 19 | |
| 20 | Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> |
Andrew Geissler | 4b7c115 | 2020-11-30 19:55:29 -0600 | [diff] [blame] | 21 | |
| 22 | Refreshed for 4.0 |
| 23 | |
| 24 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame^] | 25 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 26 | --- |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 27 | sys_linux.c | 15 +++++++++------ |
| 28 | 1 file changed, 9 insertions(+), 6 deletions(-) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 29 | |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 30 | diff --git a/sys_linux.c b/sys_linux.c |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame^] | 31 | index f2baab1..14a9241 100644 |
Brad Bishop | 7f28bc5 | 2017-12-03 23:42:40 -0500 | [diff] [blame] | 32 | --- a/sys_linux.c |
| 33 | +++ b/sys_linux.c |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 34 | @@ -484,7 +484,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) |
Andrew Geissler | 4b7c115 | 2020-11-30 19:55:29 -0600 | [diff] [blame] | 35 | #endif |
| 36 | SCMP_SYS(gettimeofday), |
| 37 | SCMP_SYS(settimeofday), |
| 38 | - SCMP_SYS(time), |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 39 | |
Brad Bishop | 7f28bc5 | 2017-12-03 23:42:40 -0500 | [diff] [blame] | 40 | /* Process */ |
Andrew Geissler | 4b7c115 | 2020-11-30 19:55:29 -0600 | [diff] [blame] | 41 | SCMP_SYS(clone), |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 42 | @@ -494,7 +493,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) |
Andrew Geissler | 4b7c115 | 2020-11-30 19:55:29 -0600 | [diff] [blame] | 43 | SCMP_SYS(exit), |
| 44 | SCMP_SYS(exit_group), |
| 45 | SCMP_SYS(getpid), |
| 46 | - SCMP_SYS(getrlimit), |
| 47 | SCMP_SYS(getuid), |
William A. Kennington III | b95905d | 2021-06-02 12:40:56 -0700 | [diff] [blame] | 48 | SCMP_SYS(getuid32), |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame^] | 49 | #ifdef __NR_rseq |
| 50 | @@ -511,7 +509,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) |
Brad Bishop | 7f28bc5 | 2017-12-03 23:42:40 -0500 | [diff] [blame] | 51 | /* Memory */ |
Andrew Geissler | 4b7c115 | 2020-11-30 19:55:29 -0600 | [diff] [blame] | 52 | SCMP_SYS(brk), |
| 53 | SCMP_SYS(madvise), |
| 54 | - SCMP_SYS(mmap), |
| 55 | SCMP_SYS(mmap2), |
| 56 | SCMP_SYS(mprotect), |
| 57 | SCMP_SYS(mremap), |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame^] | 58 | @@ -571,8 +568,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) |
Andrew Geissler | 4b7c115 | 2020-11-30 19:55:29 -0600 | [diff] [blame] | 59 | SCMP_SYS(sendmsg), |
| 60 | SCMP_SYS(sendto), |
| 61 | SCMP_SYS(shutdown), |
Brad Bishop | 7f28bc5 | 2017-12-03 23:42:40 -0500 | [diff] [blame] | 62 | - /* TODO: check socketcall arguments */ |
| 63 | - SCMP_SYS(socketcall), |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 64 | |
Brad Bishop | 7f28bc5 | 2017-12-03 23:42:40 -0500 | [diff] [blame] | 65 | /* General I/O */ |
Andrew Geissler | 4b7c115 | 2020-11-30 19:55:29 -0600 | [diff] [blame] | 66 | SCMP_SYS(_newselect), |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame^] | 67 | @@ -596,7 +591,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) |
Andrew Geissler | 4b7c115 | 2020-11-30 19:55:29 -0600 | [diff] [blame] | 68 | #ifdef __NR_futex_time64 |
| 69 | SCMP_SYS(futex_time64), |
| 70 | #endif |
| 71 | - SCMP_SYS(select), |
| 72 | SCMP_SYS(set_robust_list), |
| 73 | SCMP_SYS(write), |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 74 | |
Andrew Geissler | 87f5cff | 2022-09-30 13:13:31 -0500 | [diff] [blame^] | 75 | @@ -604,6 +598,15 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context) |
Andrew Geissler | 4b7c115 | 2020-11-30 19:55:29 -0600 | [diff] [blame] | 76 | SCMP_SYS(getrandom), |
| 77 | SCMP_SYS(sysinfo), |
| 78 | SCMP_SYS(uname), |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 79 | + /* not always available */ |
Brad Bishop | 7f28bc5 | 2017-12-03 23:42:40 -0500 | [diff] [blame] | 80 | +#if ! defined(__ARM_EABI__) |
| 81 | + SCMP_SYS(time), |
| 82 | + SCMP_SYS(getrlimit), |
| 83 | + SCMP_SYS(select), |
| 84 | + SCMP_SYS(mmap), |
| 85 | + /* TODO: check socketcall arguments */ |
| 86 | + SCMP_SYS(socketcall), |
| 87 | +#endif |
| 88 | }; |
Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 89 | |
William A. Kennington III | b95905d | 2021-06-02 12:40:56 -0700 | [diff] [blame] | 90 | const int denied_any[] = { |