Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 6aa7eec5002756f5398774a35fb9d985e15a4573 / . / meta-openembedded / meta-networking / recipes-support / chrony / chrony / arm_eabi.patch
blob: 82c0e1b68bb5dbf2fc3dc43cbe7333ef45328595 [file] [log] [blame]
Andrew Geissler87f5cff2022-09-30 13:13:31 -0500[diff] [blame]1From 28b9f115e36e2133301b02fa02ad71a8efbed9b9 Mon Sep 17 00:00:00 2001
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]2From: Joe Slater <jslater@windriver.com>
3Date: Thu, 9 Mar 2017 10:58:06 -0800
Brad Bishop26bdd442019-08-16 17:08:17 -0400[diff] [blame]4Subject: [PATCH] chrony: fix build failure for arma9
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]5
Andrew Geissler6aa7eec2023-03-03 12:41:14 -0600[diff] [blame^]6Eliminate references to syscalls not available
7for ARM_EABI. Also add a dependency on libseccomp
8which is needed for scfilter to work.
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]9
Andrew Geissler6aa7eec2023-03-03 12:41:14 -0600[diff] [blame^]10Set PACKAGECONFIG to not enable scfilter, since
11kernel CONFIG_SECCOMP is unlikely to be set. This
12aligns the usage of libseccomp with that of other packages.
Brad Bishop7f28bc52017-12-03 23:42:40 -0500[diff] [blame]13
Andrew Geissler6aa7eec2023-03-03 12:41:14 -0600[diff] [blame^]14Upstream-Status: Pending
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]15
Andrew Geissler6aa7eec2023-03-03 12:41:14 -0600[diff] [blame^]16Signed-off-by: Joe Slater <jslater@windriver.com>
Brad Bishop7f28bc52017-12-03 23:42:40 -0500[diff] [blame]17
Andrew Geissler6aa7eec2023-03-03 12:41:14 -0600[diff] [blame^]18Refresh patch for new upstream version.
Brad Bishop316dfdd2018-06-25 12:45:53 -0400[diff] [blame]19
Andrew Geissler6aa7eec2023-03-03 12:41:14 -0600[diff] [blame^]20Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org>
Andrew Geissler4b7c1152020-11-30 19:55:29 -0600[diff] [blame]21
Andrew Geissler6aa7eec2023-03-03 12:41:14 -0600[diff] [blame^]22Refreshed for 4.0
Andrew Geissler4b7c1152020-11-30 19:55:29 -0600[diff] [blame]23
Andrew Geissler6aa7eec2023-03-03 12:41:14 -0600[diff] [blame^]24Signed-off-by: Khem Raj <raj.khem@gmail.com>
Andrew Geissler87f5cff2022-09-30 13:13:31 -0500[diff] [blame]25
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]26---
Andrew Geissler595f6302022-01-24 19:11:47 +0000[diff] [blame]27 sys_linux.c | 15 +++++++++------
28 1 file changed, 9 insertions(+), 6 deletions(-)
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800[diff] [blame]29
Andrew Geissler595f6302022-01-24 19:11:47 +0000[diff] [blame]30diff --git a/sys_linux.c b/sys_linux.c
Andrew Geissler87f5cff2022-09-30 13:13:31 -0500[diff] [blame]31index f2baab1..14a9241 100644
Brad Bishop7f28bc52017-12-03 23:42:40 -0500[diff] [blame]32--- a/sys_linux.c
33+++ b/sys_linux.c
Andrew Geissler595f6302022-01-24 19:11:47 +0000[diff] [blame]34@@ -484,7 +484,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context)
Andrew Geissler4b7c1152020-11-30 19:55:29 -0600[diff] [blame]35 #endif
36 SCMP_SYS(gettimeofday),
37 SCMP_SYS(settimeofday),
38- SCMP_SYS(time),
Andrew Geissler595f6302022-01-24 19:11:47 +0000[diff] [blame]39
Brad Bishop7f28bc52017-12-03 23:42:40 -0500[diff] [blame]40 /* Process */
Andrew Geissler4b7c1152020-11-30 19:55:29 -0600[diff] [blame]41 SCMP_SYS(clone),
Andrew Geissler595f6302022-01-24 19:11:47 +0000[diff] [blame]42@@ -494,7 +493,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context)
Andrew Geissler4b7c1152020-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 IIIb95905d2021-06-02 12:40:56 -0700[diff] [blame]48 SCMP_SYS(getuid32),
Andrew Geissler87f5cff2022-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 Bishop7f28bc52017-12-03 23:42:40 -0500[diff] [blame]51 /* Memory */
Andrew Geissler4b7c1152020-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 Geissler87f5cff2022-09-30 13:13:31 -0500[diff] [blame]58@@ -571,8 +568,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context)
Andrew Geissler4b7c1152020-11-30 19:55:29 -0600[diff] [blame]59 SCMP_SYS(sendmsg),
60 SCMP_SYS(sendto),
61 SCMP_SYS(shutdown),
Brad Bishop7f28bc52017-12-03 23:42:40 -0500[diff] [blame]62- /* TODO: check socketcall arguments */
63- SCMP_SYS(socketcall),
Andrew Geissler595f6302022-01-24 19:11:47 +0000[diff] [blame]64
Brad Bishop7f28bc52017-12-03 23:42:40 -0500[diff] [blame]65 /* General I/O */
Andrew Geissler4b7c1152020-11-30 19:55:29 -0600[diff] [blame]66 SCMP_SYS(_newselect),
Andrew Geissler87f5cff2022-09-30 13:13:31 -0500[diff] [blame]67@@ -596,7 +591,6 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context)
Andrew Geissler4b7c1152020-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 Geissler595f6302022-01-24 19:11:47 +0000[diff] [blame]74
Andrew Geissler87f5cff2022-09-30 13:13:31 -0500[diff] [blame]75@@ -604,6 +598,15 @@ SYS_Linux_EnableSystemCallFilter(int level, SYS_ProcessContext context)
Andrew Geissler4b7c1152020-11-30 19:55:29 -0600[diff] [blame]76 SCMP_SYS(getrandom),
77 SCMP_SYS(sysinfo),
78 SCMP_SYS(uname),
Andrew Geissler595f6302022-01-24 19:11:47 +0000[diff] [blame]79+ /* not always available */
Brad Bishop7f28bc52017-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 Geissler595f6302022-01-24 19:11:47 +0000[diff] [blame]89
William A. Kennington IIIb95905d2021-06-02 12:40:56 -0700[diff] [blame]90 const int denied_any[] = {