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

pseudo: add macro guard for seccomp

Browse Source 
It fails to compile pseudo-native on centos 7:

| ports/linux/pseudo_wrappers.c: In function ‘prctl’:
| ports/linux/pseudo_wrappers.c:129:14: error: ‘SECCOMP_SET_MODE_FILTER’ undeclared (first use in this function)
|    if (cmd == SECCOMP_SET_MODE_FILTER) {
|               ^

Add macro guard for the definition to avoid the failure.

(From OE-Core rev: d1c4492cb9cf5a624bb996c94e9a1589133be014)

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Kai Kang
2020-04-27 14:04:16 +08:00
committed by Richard Purdie
parent 48a8eb0fc2
commit 430ef75dcf
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/pseudo/files/seccomp.patch
+14 -1
View File
@@ -7,6 +7,17 @@ Upstream-Status: Pending
RP 2020/4/3 RP 2020/4/3
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It fails to compile pseudo-native on centos 7:
| ports/linux/pseudo_wrappers.c: In function ‘prctl’:
| ports/linux/pseudo_wrappers.c:129:14: error: ‘SECCOMP_SET_MODE_FILTER’ undeclared (first use in this function)
| if (cmd == SECCOMP_SET_MODE_FILTER) {
| ^
Add macro guard for seccomp to avoid the failure.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Index: git/ports/linux/pseudo_wrappers.c Index: git/ports/linux/pseudo_wrappers.c
=================================================================== ===================================================================
--- git.orig/ports/linux/pseudo_wrappers.c --- git.orig/ports/linux/pseudo_wrappers.c
@@ -40,7 +51,7 @@ Index: git/ports/linux/pseudo_wrappers.c
/* gcc magic to attempt to just pass these args to syscall. we have to /* gcc magic to attempt to just pass these args to syscall. we have to
* guess about the number of args; the docs discuss calling conventions * guess about the number of args; the docs discuss calling conventions
* up to 7, so let's try that? * up to 7, so let's try that?
@@ -92,3 +108,42 @@ static long wrap_syscall(long nr, va_lis @@ -92,3 +108,44 @@ static long wrap_syscall(long nr, va_lis
(void) ap; (void) ap;
return -1; return -1;
} }
@@ -56,6 +67,7 @@ Index: git/ports/linux/pseudo_wrappers.c
+ return rc; + return rc;
+ } + }
+ +
+#ifdef SECCOMP_SET_MODE_FILTER
+ /* pseudo and seccomp are incompatible as pseudo uses different syscalls + /* pseudo and seccomp are incompatible as pseudo uses different syscalls
+ * so pretend to enable seccomp but really do nothing */ + * so pretend to enable seccomp but really do nothing */
+ if (option == PR_SET_SECCOMP) { + if (option == PR_SET_SECCOMP) {
@@ -67,6 +79,7 @@ Index: git/ports/linux/pseudo_wrappers.c
+ return 0; + return 0;
+ } + }
+ } + }
+#endif
+ +
+ /* gcc magic to attempt to just pass these args to prctl. we have to + /* gcc magic to attempt to just pass these args to prctl. we have to
+ * guess about the number of args; the docs discuss calling conventions + * guess about the number of args; the docs discuss calling conventions