Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 1 | From f35e07aceb4a16121d83b47ee77990018bec98ea 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> |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 21 | --- |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 22 | sys_linux.c | 20 ++++++++++++++------ |
| 23 | 1 file changed, 14 insertions(+), 6 deletions(-) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 24 | |
| 25 | diff --git a/sys_linux.c b/sys_linux.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 26 | index 898dc7a..b268ad1 100644 |
Brad Bishop | 7f28bc5 | 2017-12-03 23:42:40 -0500 | [diff] [blame] | 27 | --- a/sys_linux.c |
| 28 | +++ b/sys_linux.c |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 29 | @@ -479,14 +479,14 @@ SYS_Linux_EnableSystemCallFilter(int level) |
Brad Bishop | 7f28bc5 | 2017-12-03 23:42:40 -0500 | [diff] [blame] | 30 | const int syscalls[] = { |
| 31 | /* Clock */ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 32 | SCMP_SYS(adjtimex), SCMP_SYS(clock_gettime), SCMP_SYS(gettimeofday), |
| 33 | - SCMP_SYS(settimeofday), SCMP_SYS(time), |
| 34 | + SCMP_SYS(settimeofday), |
Brad Bishop | 7f28bc5 | 2017-12-03 23:42:40 -0500 | [diff] [blame] | 35 | /* Process */ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 36 | SCMP_SYS(clone), SCMP_SYS(exit), SCMP_SYS(exit_group), SCMP_SYS(getpid), |
| 37 | - SCMP_SYS(getrlimit), SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn), |
| 38 | + SCMP_SYS(rt_sigaction), SCMP_SYS(rt_sigreturn), |
| 39 | SCMP_SYS(rt_sigprocmask), SCMP_SYS(set_tid_address), SCMP_SYS(sigreturn), |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 40 | SCMP_SYS(wait4), SCMP_SYS(waitpid), |
Brad Bishop | 7f28bc5 | 2017-12-03 23:42:40 -0500 | [diff] [blame] | 41 | /* Memory */ |
| 42 | - SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap), SCMP_SYS(mmap2), |
| 43 | + SCMP_SYS(brk), SCMP_SYS(madvise), SCMP_SYS(mmap2), |
| 44 | SCMP_SYS(mprotect), SCMP_SYS(mremap), SCMP_SYS(munmap), SCMP_SYS(shmdt), |
| 45 | /* Filesystem */ |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 46 | SCMP_SYS(_llseek), SCMP_SYS(access), SCMP_SYS(chmod), SCMP_SYS(chown), |
| 47 | @@ -499,14 +499,22 @@ SYS_Linux_EnableSystemCallFilter(int level) |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame] | 48 | SCMP_SYS(bind), SCMP_SYS(connect), SCMP_SYS(getsockname), SCMP_SYS(getsockopt), |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 49 | SCMP_SYS(recv), SCMP_SYS(recvfrom), SCMP_SYS(recvmmsg), SCMP_SYS(recvmsg), |
| 50 | SCMP_SYS(send), SCMP_SYS(sendmmsg), SCMP_SYS(sendmsg), SCMP_SYS(sendto), |
Brad Bishop | 7f28bc5 | 2017-12-03 23:42:40 -0500 | [diff] [blame] | 51 | - /* TODO: check socketcall arguments */ |
| 52 | - SCMP_SYS(socketcall), |
| 53 | /* General I/O */ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 54 | SCMP_SYS(_newselect), SCMP_SYS(close), SCMP_SYS(open), SCMP_SYS(openat), SCMP_SYS(pipe), |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 55 | SCMP_SYS(pipe2), SCMP_SYS(poll), SCMP_SYS(ppoll), SCMP_SYS(pselect6), SCMP_SYS(read), |
| 56 | - SCMP_SYS(futex), SCMP_SYS(select), SCMP_SYS(set_robust_list), SCMP_SYS(write), |
| 57 | + SCMP_SYS(futex), SCMP_SYS(set_robust_list), SCMP_SYS(write), |
Brad Bishop | 7f28bc5 | 2017-12-03 23:42:40 -0500 | [diff] [blame] | 58 | /* Miscellaneous */ |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 59 | SCMP_SYS(getrandom), SCMP_SYS(sysinfo), SCMP_SYS(uname), |
Brad Bishop | 7f28bc5 | 2017-12-03 23:42:40 -0500 | [diff] [blame] | 60 | + /* not always available */ |
| 61 | +#if ! defined(__ARM_EABI__) |
| 62 | + SCMP_SYS(time), |
| 63 | + SCMP_SYS(getrlimit), |
| 64 | + SCMP_SYS(select), |
| 65 | + SCMP_SYS(mmap), |
| 66 | + /* TODO: check socketcall arguments */ |
| 67 | + SCMP_SYS(socketcall), |
| 68 | +#endif |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 69 | + |
Brad Bishop | 7f28bc5 | 2017-12-03 23:42:40 -0500 | [diff] [blame] | 70 | }; |
| 71 | |
| 72 | const int socket_domains[] = { |
Brad Bishop | 26bdd44 | 2019-08-16 17:08:17 -0400 | [diff] [blame^] | 73 | -- |
| 74 | 2.17.1 |
| 75 | |