| Andrew Geissler | 5f35090 | 2021-07-23 13:09:54 -0400 | [diff] [blame] | 1 | From 82386110e67cf75c224e9817fce55e6b0f143266 Mon Sep 17 00:00:00 2001 |
| 2 | From: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
| 3 | Date: Mon, 8 Feb 2021 07:23:54 +0100 |
| 4 | Subject: [PATCH] src/privsep-linux.c: add support for arc (#28) |
| 5 | |
| 6 | Fix the following build failure: |
| 7 | |
| 8 | privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet" |
| 9 | # error "Platform does not support seccomp filter yet" |
| 10 | ^~~~~ |
| 11 | In file included from privsep-linux.c:36: |
| 12 | privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'? |
| 13 | BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0), |
| 14 | ^~~~~~~~~~~~~~~~~~ |
| 15 | |
| 16 | It should be noted that AUDIT_ARCH_{ARCOMPACT,ARCV2} is only defined |
| 17 | since kernel 5.2 and |
| 18 | https://github.com/torvalds/linux/commit/67f2a8a29311841ba6ab9b0e2d1b8f1e9978cd84 |
| 19 | |
| 20 | Detection of arc compact and arc v2 have been "copy/pasted" from |
| 21 | https://github.com/wbx-github/uclibc-ng/commit/afab56958f1cbb47b831ee3ebff231dfbae74af2 |
| 22 | |
| 23 | Fixes: |
| 24 | - http://autobuild.buildroot.org/results/d29083700a80dd647621eed06faeeae03f0587d3 |
| 25 | |
| 26 | Upstream-Status: Backport [https://github.com/NetworkConfiguration/dhcpcd/commit/82386110e67cf75c224e9817fce55e6b0f143266] |
| 27 | |
| 28 | Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> |
| 29 | Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com> |
| 30 | --- |
| 31 | src/privsep-linux.c | 16 ++++++++++++++++ |
| 32 | 1 file changed, 16 insertions(+) |
| 33 | |
| 34 | diff --git a/src/privsep-linux.c b/src/privsep-linux.c |
| 35 | index 402667af..21d41a9a 100644 |
| 36 | --- a/src/privsep-linux.c |
| 37 | +++ b/src/privsep-linux.c |
| 38 | @@ -149,6 +149,22 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg) |
| 39 | # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_I386 |
| 40 | #elif defined(__x86_64__) |
| 41 | # define SECCOMP_AUDIT_ARCH AUDIT_ARCH_X86_64 |
| 42 | +#elif defined(__arc__) |
| 43 | +# if defined(__A7__) |
| 44 | +# if (BYTE_ORDER == LITTLE_ENDIAN) |
| 45 | +# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCOMPACT |
| 46 | +# else |
| 47 | +# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCOMPACTBE |
| 48 | +# endif |
| 49 | +# elif defined(__HS__) |
| 50 | +# if (BYTE_ORDER == LITTLE_ENDIAN) |
| 51 | +# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCV2 |
| 52 | +# else |
| 53 | +# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_ARCV2BE |
| 54 | +# endif |
| 55 | +# else |
| 56 | +# error "Platform does not support seccomp filter yet" |
| 57 | +# endif |
| 58 | #elif defined(__arm__) |
| 59 | # ifndef EM_ARM |
| 60 | # define EM_ARM 40 |
| 61 | -- |
| 62 | 2.16.2 |
| 63 | |