fix: 修复无法注入su到第二个进程

unkn0wName · unkn0wName · commit adcb7049da61 · 2023-03-30T19:12:48.000+08:00
diff --git a/PermissionManager/app/src/main/cpp/root.cpp b/PermissionManager/app/src/main/cpp/root.cpp
@@ -236,7 +236,7 @@ Java_com_linux_permissionmanager_MainActivity_autoSuEnvInject(
     }
     std::string kill_cmd;
     for (pid_t t : vOut) {
-        err =  kill_process(strRootKey.c_str(), t);
+        err =  safe_kill_process(strRootKey.c_str(), t);
         sstr << "kill_ret err:"<< err << std::endl;
         if (err != 0) {
             return env->NewStringUTF(sstr.str().c_str());
diff --git a/testRoot/su_install_helper.cpp b/testRoot/su_install_helper.cpp
@@ -91,15 +91,18 @@ std::string install_su(const char* str_root_key, const char* base_path, const ch
 		return {};
 	}
 	std::string su_hide_full_path = _su_hide_folder_path + "/" + "su";
-	if (!copy_file(origin_su_full_path, su_hide_full_path.c_str())) {
-		TRACE("copy file error.\n");
-		err = -504;
-		return {};
-	}
-	if (!set_file_allow_access_mode(su_hide_full_path.c_str())) {
-		TRACE("set file allow access mode error.\n");
-		err = -505;
-		return {};
+	//如果存在了就不要理了
+	if(access(su_hide_full_path.c_str(), F_OK) == -1) {
+		if (!copy_file(origin_su_full_path, su_hide_full_path.c_str())) {
+			TRACE("copy file error.\n");
+			err = -504;
+			return {};
+		}
+		if (!set_file_allow_access_mode(su_hide_full_path.c_str())) {
+			TRACE("set file allow access mode error.\n");
+			err = -505;
+			return {};
+		}
 	}
 	err = 0;
 	return su_hide_full_path;

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ Java_com_linux_permissionmanager_MainActivity_autoSuEnvInject(`
`236`	`236`	`}`
`237`	`237`	`std::string kill_cmd;`
`238`	`238`	`for (pid_t t : vOut) {`
`239`		`- err = kill_process(strRootKey.c_str(), t);`
	`239`	`+ err = safe_kill_process(strRootKey.c_str(), t);`
`240`	`240`	`sstr << "kill_ret err:"<< err << std::endl;`
`241`	`241`	`if (err != 0) {`
`242`	`242`	`return env->NewStringUTF(sstr.str().c_str());`