Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-31 19:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:PS] Rewrite NtSetInformationThread to match NtQueryInformationThread

Browse source 
The Information length must always be checked before referencing the thread object. This fixes a test failure.
This commit is contained in:
Eric Kohl 2021-05-02 13:46:22 +02:00
parent 5585767460
commit 2e88e2b904
1 changed files with 127 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

149
ntoskrnl/ps/query.c
View file

@ -2018,7 +2018,6 @@ NtSetInformationThread(IN HANDLE ThreadHandle,
IN ULONG ThreadInformationLength) IN ULONG ThreadInformationLength)
{ {
PETHREAD Thread; PETHREAD Thread;
ULONG Access;
KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); KPROCESSOR_MODE PreviousMode = ExGetPreviousMode();
NTSTATUS Status; NTSTATUS Status;
HANDLE TokenHandle = NULL; HANDLE TokenHandle = NULL;
@ -2046,23 +2045,6 @@ NtSetInformationThread(IN HANDLE ThreadHandle,
if (!NT_SUCCESS(Status)) return Status; if (!NT_SUCCESS(Status)) return Status;
#endif #endif
/* Check what class this is */
Access = THREAD_SET_INFORMATION;
if (ThreadInformationClass == ThreadImpersonationToken)
{
/* Setting the impersonation token needs a special mask */
Access = THREAD_SET_THREAD_TOKEN;
}
/* Reference the thread */
Status = ObReferenceObjectByHandle(ThreadHandle,
Access,
PsThreadType,
PreviousMode,
(PVOID*)&Thread,
NULL);
if (!NT_SUCCESS(Status)) return Status;
/* Check what kind of information class this is */ /* Check what kind of information class this is */
switch (ThreadInformationClass) switch (ThreadInformationClass)
{ {
@ -2099,8 +2081,21 @@ NtSetInformationThread(IN HANDLE ThreadHandle,
break; break;
} }
/* Reference the thread */
Status = ObReferenceObjectByHandle(ThreadHandle,
THREAD_SET_INFORMATION,
PsThreadType,
PreviousMode,
(PVOID*)&Thread,
NULL);
if (!NT_SUCCESS(Status))
break;
/* Set the priority */ /* Set the priority */
KeSetPriorityThread(&Thread->Tcb, Priority); KeSetPriorityThread(&Thread->Tcb, Priority);
/* Dereference the thread */
ObDereferenceObject(Thread);
break; break;
case ThreadBasePriority: case ThreadBasePriority:
@ -2145,8 +2140,21 @@ NtSetInformationThread(IN HANDLE ThreadHandle,
} }
} }
/* Reference the thread */
Status = ObReferenceObjectByHandle(ThreadHandle,
THREAD_SET_INFORMATION,
PsThreadType,
PreviousMode,
(PVOID*)&Thread,
NULL);
if (!NT_SUCCESS(Status))
break;
/* Set the base priority */ /* Set the base priority */
KeSetBasePriorityThread(&Thread->Tcb, Priority); KeSetBasePriorityThread(&Thread->Tcb, Priority);
/* Dereference the thread */
ObDereferenceObject(Thread);
break; break;
case ThreadAffinityMask: case ThreadAffinityMask:
@ -2180,6 +2188,16 @@ NtSetInformationThread(IN HANDLE ThreadHandle,
break; break;
} }
/* Reference the thread */
Status = ObReferenceObjectByHandle(ThreadHandle,
THREAD_SET_INFORMATION,
PsThreadType,
PreviousMode,
(PVOID*)&Thread,
NULL);
if (!NT_SUCCESS(Status))
break;
/* Get the process */ /* Get the process */
Process = Thread->ThreadsProcess; Process = Thread->ThreadsProcess;
@ -2214,7 +2232,8 @@ NtSetInformationThread(IN HANDLE ThreadHandle,
Status = STATUS_PROCESS_IS_TERMINATING; Status = STATUS_PROCESS_IS_TERMINATING;
} }
/* Return status */ /* Dereference the thread */
ObDereferenceObject(Thread);
break; break;
case ThreadImpersonationToken: case ThreadImpersonationToken:
@ -2240,8 +2259,21 @@ NtSetInformationThread(IN HANDLE ThreadHandle,
} }
_SEH2_END; _SEH2_END;
/* Reference the thread */
Status = ObReferenceObjectByHandle(ThreadHandle,
THREAD_SET_THREAD_TOKEN,
PsThreadType,
PreviousMode,
(PVOID*)&Thread,
NULL);
if (!NT_SUCCESS(Status))
break;
/* Assign the actual token */ /* Assign the actual token */
Status = PsAssignImpersonationToken(Thread, TokenHandle); Status = PsAssignImpersonationToken(Thread, TokenHandle);
/* Dereference the thread */
ObDereferenceObject(Thread);
break; break;
case ThreadQuerySetWin32StartAddress: case ThreadQuerySetWin32StartAddress:
@ -2267,8 +2299,21 @@ NtSetInformationThread(IN HANDLE ThreadHandle,
} }
_SEH2_END; _SEH2_END;
/* Reference the thread */
Status = ObReferenceObjectByHandle(ThreadHandle,
THREAD_SET_INFORMATION,
PsThreadType,
PreviousMode,
(PVOID*)&Thread,
NULL);
if (!NT_SUCCESS(Status))
break;
/* Set the address */ /* Set the address */
Thread->Win32StartAddress = Address; Thread->Win32StartAddress = Address;
/* Dereference the thread */
ObDereferenceObject(Thread);
break; break;
case ThreadIdealProcessor: case ThreadIdealProcessor:
@ -2302,6 +2347,16 @@ NtSetInformationThread(IN HANDLE ThreadHandle,
break; break;
} }
/* Reference the thread */
Status = ObReferenceObjectByHandle(ThreadHandle,
THREAD_SET_INFORMATION,
PsThreadType,
PreviousMode,
(PVOID*)&Thread,
NULL);
if (!NT_SUCCESS(Status))
break;
/* Set the ideal */ /* Set the ideal */
Status = KeSetIdealProcessorThread(&Thread->Tcb, Status = KeSetIdealProcessorThread(&Thread->Tcb,
(CCHAR)IdealProcessor); (CCHAR)IdealProcessor);
@ -2317,6 +2372,8 @@ NtSetInformationThread(IN HANDLE ThreadHandle,
ExReleaseRundownProtection(&Thread->RundownProtect); ExReleaseRundownProtection(&Thread->RundownProtect);
} }
/* Dereference the thread */
ObDereferenceObject(Thread);
break; break;
case ThreadPriorityBoost: case ThreadPriorityBoost:
@ -2342,8 +2399,21 @@ NtSetInformationThread(IN HANDLE ThreadHandle,
} }
_SEH2_END; _SEH2_END;
/* Reference the thread */
Status = ObReferenceObjectByHandle(ThreadHandle,
THREAD_SET_INFORMATION,
PsThreadType,
PreviousMode,
(PVOID*)&Thread,
NULL);
if (!NT_SUCCESS(Status))
break;
/* Call the kernel */ /* Call the kernel */
KeSetDisableBoostThread(&Thread->Tcb, (BOOLEAN)DisableBoost); KeSetDisableBoostThread(&Thread->Tcb, (BOOLEAN)DisableBoost);
/* Dereference the thread */
ObDereferenceObject(Thread);
break; break;
case ThreadZeroTlsCell: case ThreadZeroTlsCell:
@ -2377,6 +2447,16 @@ NtSetInformationThread(IN HANDLE ThreadHandle,
break; break;
} }
/* Reference the thread */
Status = ObReferenceObjectByHandle(ThreadHandle,
THREAD_SET_INFORMATION,
PsThreadType,
PreviousMode,
(PVOID*)&Thread,
NULL);
if (!NT_SUCCESS(Status))
break;
/* Get the process */ /* Get the process */
Process = Thread->ThreadsProcess; Process = Thread->ThreadsProcess;
@ -2421,7 +2501,8 @@ NtSetInformationThread(IN HANDLE ThreadHandle,
ProcThread = PsGetNextProcessThread(Process, ProcThread); ProcThread = PsGetNextProcessThread(Process, ProcThread);
} }
/* All done */ /* Dereference the thread */
ObDereferenceObject(Thread);
break; break;
case ThreadBreakOnTermination: case ThreadBreakOnTermination:
@ -2455,6 +2536,16 @@ NtSetInformationThread(IN HANDLE ThreadHandle,
break; break;
} }
/* Reference the thread */
Status = ObReferenceObjectByHandle(ThreadHandle,
THREAD_SET_INFORMATION,
PsThreadType,
PreviousMode,
(PVOID*)&Thread,
NULL);
if (!NT_SUCCESS(Status))
break;
/* Set or clear the flag */ /* Set or clear the flag */
if (Break) if (Break)
{ {
@ -2464,6 +2555,9 @@ NtSetInformationThread(IN HANDLE ThreadHandle,
{ {
PspClearCrossThreadFlag(Thread, CT_BREAK_ON_TERMINATION_BIT); PspClearCrossThreadFlag(Thread, CT_BREAK_ON_TERMINATION_BIT);
} }
/* Dereference the thread */
ObDereferenceObject(Thread);
break; break;
case ThreadHideFromDebugger: case ThreadHideFromDebugger:
@ -2475,8 +2569,21 @@ NtSetInformationThread(IN HANDLE ThreadHandle,
break; break;
} }
/* Reference the thread */
Status = ObReferenceObjectByHandle(ThreadHandle,
THREAD_SET_INFORMATION,
PsThreadType,
PreviousMode,
(PVOID*)&Thread,
NULL);
if (!NT_SUCCESS(Status))
break;
/* Set the flag */ /* Set the flag */
PspSetCrossThreadFlag(Thread, CT_HIDE_FROM_DEBUGGER_BIT); PspSetCrossThreadFlag(Thread, CT_HIDE_FROM_DEBUGGER_BIT);
/* Dereference the thread */
ObDereferenceObject(Thread);
break; break;
default: default:
@ -2485,8 +2592,6 @@ NtSetInformationThread(IN HANDLE ThreadHandle,
Status = STATUS_NOT_IMPLEMENTED; Status = STATUS_NOT_IMPLEMENTED;
} }
/* Dereference and return status */
ObDereferenceObject(Thread);
return Status; return Status;
} }