!2180 fix:支持appspawn reset 校验信息

Merge pull request !2180 from cheng_jinsong/appspawn-reset

services/param/linux/param_request.c

@@ -273,3 +273,24 @@ int WatchParamCheck(const char *keyprefix)
     PARAM_CHECK(ret == 0, return ret, "Forbid to watcher parameter %s", keyprefix);
     return 0;
 }
+
+void ResetParamSecurityLabel(void)
+{
+#ifdef RESET_CHILD_FOR_VERIFY
+    ParamWorkSpace *paramSpace = GetParamWorkSpace();
+    PARAM_CHECK(paramSpace != NULL, return, "Invalid paramSpace");
+#if !(defined __LITEOS_A__ || defined __LITEOS_M__)
+    paramSpace->securityLabel.cred.pid = getpid();
+    paramSpace->securityLabel.cred.uid = geteuid();
+    paramSpace->securityLabel.cred.gid = getegid();
+    paramSpace->flags |= WORKSPACE_FLAGS_NEED_ACCESS;
+#endif
+#endif
+    PARAM_LOGI("ResetParamSecurityLabel g_clientFd: %d ", g_clientFd);
+    pthread_mutex_lock(&g_clientMutex);
+    if (g_clientFd != INVALID_SOCKET) {
+        close(g_clientFd);
+        g_clientFd = INVALID_SOCKET;
+    }
+    pthread_mutex_unlock(&g_clientMutex);
+}

services/param/manager/param_manager.c

@@ -623,18 +623,6 @@ INIT_LOCAL_API int CheckParamName(const char *name, int info)
     return 0;
 }
 
-void ResetParamSecurityLabel(void)
-{
-    ParamWorkSpace *paramSpace = GetParamWorkSpace();
-    PARAM_CHECK(paramSpace != NULL, return, "Invalid paramSpace");
-#if !(defined __LITEOS_A__ || defined __LITEOS_M__)
-    paramSpace->securityLabel.cred.pid = getpid();
-    paramSpace->securityLabel.cred.uid = geteuid();
-    paramSpace->securityLabel.cred.gid = getegid();
-    paramSpace->flags |= WORKSPACE_FLAGS_NEED_ACCESS;
-#endif
-}
-
 static int CheckParamPermission_(WorkSpace **workspace, ParamTrieNode **node,
     const ParamSecurityLabel *srcLabel, const char *name, uint32_t mode)
 {

test/unittest/param/param_unittest.cpp

@@ -158,7 +158,9 @@ public:
     // 添加一个label，完全匹配
     int TestAddSecurityLabel4()
     {
+#if !(defined __LITEOS_A__ || defined __LITEOS_M__)
         ResetParamSecurityLabel();
+#endif
         GetParamSecurityLabel()->cred.gid = 9999;  // 9999 test gid
         const char *name = "label4.test.aaa.bbb.ccc.dddd.eee";
         const char *value = "2001";