mirror of
https://git.busybox.net/buildroot.git
synced 2024-12-12 06:43:43 +08:00
e5594f7239
dhcpcd includes privsep-linux.c which contains platform-specific definitions for the seccomp fixes. A lot of our architectures were not supported yet in the 9.4.0 release, but are supported now thanks to Fabrice Fontaine. Cherry-pick those patches. All of them affect the same code, but they are cherry-picked individually to keep the correspondence with upstream. Slight adjustments had to be made but there were no merge conflicts. Fixes: - http://autobuild.buildroot.org/results/9ed863b3ba5e6e0587a48e619395e5bdb7e9c557 - http://autobuild.buildroot.org/results/affd2f094084c4f53a324830539d07050b83587e - http://autobuild.buildroot.org/results/67f39606054930d307ddd0eb7743f06316d41544 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From 1a77d82b0020ff4c71ffe55262676c3403978bd5 Mon Sep 17 00:00:00 2001
|
|
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
Date: Sun, 31 Jan 2021 03:35:10 +0100
|
|
Subject: [PATCH] src/privsep-linux.c: add support for xtensa (#22)
|
|
|
|
Fix the following build failure:
|
|
|
|
privsep-linux.c:206:4: error: #error "Platform does not support seccomp filter yet"
|
|
# error "Platform does not support seccomp filter yet"
|
|
^~~~~
|
|
In file included from privsep-linux.c:36:
|
|
privsep-linux.c:213:38: error: 'SECCOMP_AUDIT_ARCH' undeclared here (not in a function); did you mean 'SECCOMP_ALLOW_ARG'?
|
|
BPF_JUMP(BPF_JMP + BPF_JEQ + BPF_K, SECCOMP_AUDIT_ARCH, 1, 0),
|
|
^~~~~~~~~~~~~~~~~~
|
|
|
|
It should be noted that AUDIT_ARCH_XTENSA is only defined since kernel
|
|
5.0 and
|
|
https://github.com/torvalds/linux/commit/98c3115a4ec56f03056efd9295e0fcb4c5c57a85
|
|
|
|
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
|
(cherry picked from commit 19c3d9209a834e02918a17e011afd9da3e5be38d)
|
|
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
|
---
|
|
src/privsep-linux.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/src/privsep-linux.c b/src/privsep-linux.c
|
|
index 8716032c..f1b33f91 100644
|
|
--- a/src/privsep-linux.c
|
|
+++ b/src/privsep-linux.c
|
|
@@ -204,6 +204,8 @@ ps_root_sendnetlink(struct dhcpcd_ctx *ctx, int protocol, struct msghdr *msg)
|
|
# else
|
|
# define AUDIT_ARCH_SPARC
|
|
# endif
|
|
+#elif defined(__xtensa__)
|
|
+# define SECCOMP_AUDIT_ARCH AUDIT_ARCH_XTENSA
|
|
#else
|
|
# error "Platform does not support seccomp filter yet"
|
|
#endif
|
|
--
|
|
2.29.2
|
|
|