yinshaoze
diff --git a/‎Lite_version/testRoot/jni/kernel_root_kit/include/rootkit_err_def.h‎
Lines changed: 0 additions & 1 deletion b/‎Lite_version/testRoot/jni/kernel_root_kit/include/rootkit_err_def.h‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎Lite_version/testRoot/jni/kernel_root_kit/lib/libkernel_root_kit_static.a‎
34.6 KB b/‎Lite_version/testRoot/jni/kernel_root_kit/lib/libkernel_root_kit_static.a‎
34.6 KB
diff --git a/‎Lite_version/testRoot/jni/kernel_root_kit/src/jni/rootkit_command.cpp‎
Lines changed: 8 additions & 9 deletions b/‎Lite_version/testRoot/jni/kernel_root_kit/src/jni/rootkit_command.cpp‎
Lines changed: 8 additions & 9 deletions
diff --git a/‎Lite_version/testRoot/jni/kernel_root_kit/src/jni/rootkit_exec_process.cpp‎
Lines changed: 4 additions & 6 deletions b/‎Lite_version/testRoot/jni/kernel_root_kit/src/jni/rootkit_exec_process.cpp‎
Lines changed: 4 additions & 6 deletions
@@ -4,7 +4,6 @@ enum class KRootErr : ssize_t {
 	ERR_NONE = 0,
 	ERR_PARAM = -1000,
 	ERR_NO_ROOT,
-	ERR_WAIT_FORK_CHILD,
 	ERR_READ_CHILD_ERRCODE,
 	ERR_READ_CHILD_STRING,
 	ERR_READ_CHILD_INT,
 
@@ -64,20 +64,19 @@ KRootErr run_root_cmd_with_cb(const char* str_root_key, const char* cmd, void (*
 		} while(0);
 		write_errcode_from_child(finfo, err);
 		write_string_from_child(finfo, result);
+		finfo.close_all();
 		_exit(0);
 		return {};
 	}
-	if(!is_fork_child_process_work_finished(finfo)) {
-		err = KRootErr::ERR_WAIT_FORK_CHILD;
+
+	if(!read_errcode_from_child(finfo, err)) {
+		err = KRootErr::ERR_READ_CHILD_ERRCODE;
+	} else if(!read_string_from_child(finfo, result)) {
+		err = KRootErr::ERR_READ_CHILD_STRING;
 	} else {
-		if(!read_errcode_from_child(finfo, err)) {
-			err = KRootErr::ERR_READ_CHILD_ERRCODE;
-		} else if(!read_string_from_child(finfo, result)) {
-			err = KRootErr::ERR_READ_CHILD_STRING;
-		} else {
-			cb(result.c_str());
-		}
+		cb(result.c_str());
 	}
+	int status = 0; waitpid(finfo.child_pid, &status, 0);
 	return err;
 }
 }
@@ -56,17 +56,15 @@ namespace kernel_root {
 		if (fork_pipe_child_process(finfo)) {
 			KRootErr err = unsafe_root_exec_process(str_root_key, file_path);
 			write_errcode_from_child(finfo, err);
+			finfo.close_all();
 			_exit(0);
 			return KRootErr::ERR_NONE;
 		}
 		KRootErr err = KRootErr::ERR_NONE;
-		if (!is_fork_child_process_work_finished(finfo)) {
-			err = KRootErr::ERR_WAIT_FORK_CHILD;
-		} else if (!read_errcode_from_child(finfo, err)) {
-			if(err == KRootErr::ERR_READ_EOF) {
-				return KRootErr::ERR_NONE;
-			}
+		if (!read_errcode_from_child(finfo, err)) {
+			if(err == KRootErr::ERR_READ_EOF) err = KRootErr::ERR_NONE;
 		}
+		int status = 0; waitpid(finfo.child_pid, &status, 0);
 		return err;
 	}