MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-13 06:43:42 +00:00
Code Issues Releases Wiki Activity

Updated so environment block is constructed in parent instead of child, when used for execve() on linux.

Browse Source
This commit is contained in:
Bryan Roe
2021-09-07 16:24:44 -07:00
parent 3464f88dba
commit 1eae8ef45e
1 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
microstack/ILibProcessPipe.c
View File

@@ -662,6 +662,25 @@ ILibProcessPipe_Process ILibProcessPipe_Manager_SpawnProcessEx4(ILibProcessPipe_
int UID = (int)(uint64_t)(ILibPtrCAST)sid; int UID = (int)(uint64_t)(ILibPtrCAST)sid;
sigset_t sset; sigset_t sset;
sigset_t *set = NULL; sigset_t *set = NULL;
char **vars = NULL;
if (envvars != NULL)
{
int i, z, vlen = 0;
for (i = 0; ((char**)envvars)[i] != NULL; i += 2)
{
vlen += (strnlen_s(((char**)envvars)[i], sizeof(ILibScratchPad2)) + 2 + strnlen_s(((char**)envvars)[i + 1], sizeof(ILibScratchPad2)));
}
vars = (char**)ILibMemory_SmartAllocateEx(((i / 2) + 1) * sizeof(char*), vlen + sizeof(int));
((int*)ILibMemory_Extra(vars))[0] = sizeof(int);
for (i = 0; ((char**)envvars)[i] != NULL; i += 2)
{
z = ((int*)ILibMemory_Extra(vars))[0];
vars[i / 2] = (char*)ILibMemory_Extra(vars) + z;
z += sprintf_s((char*)ILibMemory_Extra(vars) + z, ILibMemory_ExtraSize(vars) - z, "%s=%s", ((char**)envvars)[i], ((char**)envvars)[i + 1]);
++z;
((int*)ILibMemory_Extra(vars))[0] = z;
}
}
if (spawnType == ILibProcessPipe_SpawnTypes_TERM) if (spawnType == ILibProcessPipe_SpawnTypes_TERM)
{ {
@@ -761,6 +780,7 @@ ILibProcessPipe_Process ILibProcessPipe_Manager_SpawnProcessEx4(ILibProcessPipe_
ILibProcessPipe_FreePipe(retVal->stdOut); ILibProcessPipe_FreePipe(retVal->stdOut);
ILibProcessPipe_FreePipe(retVal->stdIn); ILibProcessPipe_FreePipe(retVal->stdIn);
} }
ILibMemory_Free(vars);
ILibMemory_Free(retVal); ILibMemory_Free(retVal);
return(NULL); return(NULL);
} }
@@ -812,24 +832,8 @@ ILibProcessPipe_Process ILibProcessPipe_Manager_SpawnProcessEx4(ILibProcessPipe_
ignore_result(setsid()); ignore_result(setsid());
} }
if (envvars != NULL) if (vars != NULL)
{ {
char **vars = NULL;
int i, z, vlen = 0;
for (i = 0; ((char**)envvars)[i] != NULL; i += 2)
{
vlen += (strnlen_s(((char**)envvars)[i], sizeof(ILibScratchPad2)) + 2 + strnlen_s(((char**)envvars)[i + 1], sizeof(ILibScratchPad2)));
}
vars = (char**)ILibMemory_SmartAllocateEx(((i / 2) + 1) * sizeof(char*), vlen + sizeof(int));
((int*)ILibMemory_Extra(vars))[0] = sizeof(int);
for (i = 0; ((char**)envvars)[i] != NULL; i += 2)
{
z = ((int*)ILibMemory_Extra(vars))[0];
vars[i / 2] = (char*)ILibMemory_Extra(vars) + z;
z += sprintf_s((char*)ILibMemory_Extra(vars) + z, ILibMemory_ExtraSize(vars) - z, "%s=%s", ((char**)envvars)[i], ((char**)envvars)[i + 1]);
++z;
((int*)ILibMemory_Extra(vars))[0] = z;
}
execve(target, parameters, vars); execve(target, parameters, vars);
} }
else else
@@ -849,6 +853,7 @@ ILibProcessPipe_Process ILibProcessPipe_Manager_SpawnProcessEx4(ILibProcessPipe_
close(retVal->stdErr->mPipe_WriteEnd); retVal->stdErr->mPipe_WriteEnd = -1; close(retVal->stdErr->mPipe_WriteEnd); retVal->stdErr->mPipe_WriteEnd = -1;
} }
retVal->PID = pid; retVal->PID = pid;
ILibMemory_Free(vars);
#endif #endif
return retVal; return retVal;
} }