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

1. Fixed NULL reference crash that could occur if ILibProcessPipe metadata is NULL when fdsnapshot is called

Browse Source 
2. Updated MacOS KVM to set metadata on child process
This commit is contained in:
Bryan Roe
2020-06-07 01:13:21 -07:00
parent 2ac6a1037d
commit 6834a34ca6
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
meshcore/KVM/MacOS/mac_kvm.c
View File

@@ -703,6 +703,11 @@ void* kvm_relay_setup(char *exePath, void *processPipeMgr, ILibKVM_WriteHandler
// Spawn child kvm process into a specific user session // Spawn child kvm process into a specific user session
gChildProcess = ILibProcessPipe_Manager_SpawnProcessEx3(processPipeMgr, exePath, parms0, ILibProcessPipe_SpawnTypes_DEFAULT, (void*)(uint64_t)uid, 0); gChildProcess = ILibProcessPipe_Manager_SpawnProcessEx3(processPipeMgr, exePath, parms0, ILibProcessPipe_SpawnTypes_DEFAULT, (void*)(uint64_t)uid, 0);
g_slavekvm = ILibProcessPipe_Process_GetPID(gChildProcess); g_slavekvm = ILibProcessPipe_Process_GetPID(gChildProcess);
char tmp[255];
sprintf_s(tmp, sizeof(tmp), "Child KVM (pid: %d)", g_slavekvm);
ILibProcessPipe_Process_ResetMetadata(gChildProcess, tmp);
ILibProcessPipe_Process_AddHandlers(gChildProcess, 65535, &kvm_relay_ExitHandler, &kvm_relay_StdOutHandler, &kvm_relay_StdErrHandler, NULL, user); ILibProcessPipe_Process_AddHandlers(gChildProcess, 65535, &kvm_relay_ExitHandler, &kvm_relay_StdOutHandler, &kvm_relay_StdErrHandler, NULL, user);
// Run the relay // Run the relay

8
microstack/ILibProcessPipe.c
View File

@@ -190,9 +190,17 @@ char * ILibProcessPipe_Manager_OnQuery(void *chain, void *object, int fd, size_t
if (node != NULL) if (node != NULL)
{ {
ILibProcessPipe_PipeObject *pj = (ILibProcessPipe_PipeObject*)ILibLinkedList_GetDataFromNode(node); ILibProcessPipe_PipeObject *pj = (ILibProcessPipe_PipeObject*)ILibLinkedList_GetDataFromNode(node);
if (pj->metadata != NULL)
{
*dataLen = strnlen_s(pj->metadata, 1024); *dataLen = strnlen_s(pj->metadata, 1024);
ret = pj->metadata; ret = pj->metadata;
} }
else
{
*dataLen = 25;
ret = "ILibProcessPipe (unknown)";
}
}
return(ret); return(ret);
} }
void ILibProcessPipe_Manager_OnPreSelect(void* object, fd_set *readset, fd_set *writeset, fd_set *errorset, int* blocktime) void ILibProcessPipe_Manager_OnPreSelect(void* object, fd_set *readset, fd_set *writeset, fd_set *errorset, int* blocktime)