From e16c1938255e0dbae53e7a02854a206a3deadbd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E5=B9=BF=E7=94=9F?= Date: Fri, 18 Apr 2025 03:56:50 +0000 Subject: [PATCH] patch for arm64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 马广生 --- modules/common/appspawn_adapter.cpp | 21 --------------------- modules/nweb_adapter/nwebspawn_adapter.cpp | 12 ------------ 2 files changed, 33 deletions(-) diff --git a/modules/common/appspawn_adapter.cpp b/modules/common/appspawn_adapter.cpp index 67bc381a..6d5b0f7f 100644 --- a/modules/common/appspawn_adapter.cpp +++ b/modules/common/appspawn_adapter.cpp @@ -155,27 +155,6 @@ int SetSelinuxCon(const AppSpawnMgr *content, const AppSpawningCtx *property) int SetUidGidFilter(const AppSpawnMgr *content) { -#ifdef WITH_SECCOMP - bool ret = false; - if (IsNWebSpawnMode(content)) { - if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0)) { - APPSPAWN_LOGE("Failed to set no new privs"); - } - ret = SetSeccompPolicyWithName(INDIVIDUAL, NWEBSPAWN_NAME); - } else { -#ifdef SECCOMP_PRIVILEGE - if (IsDeveloperModeOpen()) { - return 0; - } -#endif - ret = SetSeccompPolicyWithName(INDIVIDUAL, APPSPAWN_NAME); - } - if (!ret) { - APPSPAWN_LOGE("Failed to set APPSPAWN seccomp filter and exit"); - _exit(0x7f); - } - APPSPAWN_LOGV("SetUidGidFilter success"); -#endif return 0; } diff --git a/modules/nweb_adapter/nwebspawn_adapter.cpp b/modules/nweb_adapter/nwebspawn_adapter.cpp index 6a54d3d0..52de9d91 100644 --- a/modules/nweb_adapter/nwebspawn_adapter.cpp +++ b/modules/nweb_adapter/nwebspawn_adapter.cpp @@ -53,18 +53,6 @@ namespace { static bool SetSeccompPolicyForRenderer(void *nwebRenderHandle) { -#ifdef WITH_SECCOMP - if (IsEnableSeccomp()) { - using SeccompFuncType = bool (*)(void); - SeccompFuncType funcSetRendererSeccompPolicy = - reinterpret_cast(dlsym(nwebRenderHandle, "SetRendererSeccompPolicy")); - if (funcSetRendererSeccompPolicy != nullptr && funcSetRendererSeccompPolicy()) { - return true; - } - APPSPAWN_LOGE("SetRendererSeccompPolicy dlsym errno: %{public}d", errno); - return false; - } -#endif return true; } -- Gitee