mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

dhcpcd: fix SECCOMP for i386

Browse Source 
The dhcpcd doesn't work on Intel 32bit platform. Backport a patch to fix
the issue.

(From OE-Core rev: e8b03a8e3a6748374340d45ce39e922eee6817e3)

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Yi Zhao
2020-12-22 16:29:33 +08:00
committed by Richard Purdie
parent 2848b3d949
commit 578818509d
2 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-connectivity/dhcpcd/dhcpcd_9.3.4.bb
+1
View File
@@ -14,6 +14,7 @@ UPSTREAM_CHECK_URI = "https://roy.marples.name/downloads/dhcpcd/"
SRC_URI = "https://roy.marples.name/downloads/${BPN}/${BPN}-${PV}.tar.xz \
file://0001-remove-INCLUDEDIR-to-prevent-build-issues.patch \
file://0001-Linux-Fix-privsep-build-by-including-sys-termios.h-f.patch \
file://0001-privsep-Fix-Linux-i386-for-SECCOMP-as-it-just-uses-s.patch \
file://dhcpcd.service \
file://dhcpcd@.service \
"
meta/recipes-connectivity/dhcpcd/files/0001-privsep-Fix-Linux-i386-for-SECCOMP-as-it-just-uses-s.patch
+57
View File
@@ -0,0 +1,57 @@
From 12cdb2be46e25e1ab99df18324b787ad8749dff7 Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Sat, 12 Dec 2020 22:12:54 +0000
Subject: [PATCH] privsep: Fix Linux i386 for SECCOMP as it just uses
socketcall
Rather than accept(2), recv(2), etc..... which is horrible!
Thanks to Steve Hirsch <stevehirsch49@msn.com> for testing.
Upstream-Status: Backport
[https://roy.marples.name/cgit/dhcpcd.git/commit/?id=12cdb2be46e25e1ab99df18324b787ad8749dff7]
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
src/privsep-linux.c | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/src/privsep-linux.c b/src/privsep-linux.c
index 050a30cf..d31d720d 100644
--- a/src/privsep-linux.c
+++ b/src/privsep-linux.c
@@ -34,6 +34,7 @@
#include <linux/audit.h>
#include <linux/filter.h>
+#include <linux/net.h>
#include <linux/seccomp.h>
#include <linux/sockios.h>
@@ -311,6 +312,23 @@ static struct sock_filter ps_seccomp_filter[] = {
#ifdef __NR_sendto
SECCOMP_ALLOW(__NR_sendto),
#endif
+#ifdef __NR_socketcall
+ /* i386 needs this and demonstrates why SECCOMP
+ * is poor compared to OpenBSD pledge(2) and FreeBSD capsicum(4)
+ * as this is soooo tied to the kernel API which changes per arch
+ * and likely libc as well. */
+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_ACCEPT),
+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_ACCEPT4),
+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_LISTEN),
+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_GETSOCKOPT), /* overflow */
+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECV),
+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECVFROM),
+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_RECVMSG),
+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SEND),
+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SENDMSG),
+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SENDTO),
+ SECCOMP_ALLOW_ARG(__NR_socketcall, 0, SYS_SHUTDOWN),
+#endif
#ifdef __NR_shutdown
SECCOMP_ALLOW(__NR_shutdown),
#endif
--
2.25.1