Land #713, Removed GetThreadId and replaced with optional CLIENTID ar…

…gument
rapid7 · Sep 20, 2024 · a6da6dd · a6da6dd
2 parents 435a3a2 + a5c1849
commit a6da6dd
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/c/meterpreter/source/metsrv/remote_thread.c b/c/meterpreter/source/metsrv/remote_thread.c
@@ -39,7 +39,8 @@ HANDLE create_remote_thread(HANDLE hProcess, SIZE_T sStackSize, LPVOID pvStartAd
 	BOOL bCreateSuspended;
 	DWORD dwThreadId;
 	HANDLE hThread;
-
+	CLIENTID ClientId;
+
 	if (pdwThreadId == NULL)
 	{
 		pdwThreadId = &dwThreadId;
@@ -74,12 +75,12 @@ HANDLE create_remote_thread(HANDLE hProcess, SIZE_T sStackSize, LPVOID pvStartAd
 		{
 			dprintf("[REMOTETHREAD] Attempting thread creation with RtlCreateUserThread");
 			bCreateSuspended = (dwCreateFlags & CREATE_SUSPENDED) == CREATE_SUSPENDED;
-			ntResult = pRtlCreateUserThread(hProcess, NULL, bCreateSuspended, 0, 0, 0, (PTHREAD_START_ROUTINE)pvStartAddress, pvStartParam, &hThread, NULL);
+			ntResult = pRtlCreateUserThread(hProcess, NULL, bCreateSuspended, 0, 0, 0, (PTHREAD_START_ROUTINE)pvStartAddress, pvStartParam, &hThread, &ClientId);
 			SetLastError(ntResult);
 
 			if (ntResult == 0 && pdwThreadId)
 			{
-				*pdwThreadId = GetThreadId(hThread);
+				*pdwThreadId = PtrToUint(ClientId.UniqueThread);
 			}
 		}
 		else