Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-30 22:49:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS]

Browse source 
- Fix Job object session ID setting and comparison; fix a list initialization.
- Correct some comments.
- As Alex noticed it 7 years and 2 months ago, in revision 23197, the ProcessSessionInformation case in the NtSetInformationProcess API doesn't set a new session ID for the given process anymore (checked by myself too), because it is set once and for all at process creation time and is stored inside the Process->Session structure managed by MM. Therefore fake changing it: we just return success if the user-defined value is the same as the session ID of the process, and otherwise we fail.

svn path=/trunk/; revision=60298
This commit is contained in:
Hermès Bélusca-Maïto 2013-09-21 22:59:24 +00:00
parent cfdd6612b1
commit ba62280d9e
3 changed files with 36 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/ntoskrnl/mm/ARM3/procsup.c
View file

@ -1576,7 +1576,7 @@ MiReleaseProcessReferenceToSessionDataPage(IN PMM_SESSION_SPACE SessionGlobal)
/* Get the session ID */
SessionId = SessionGlobal->SessionId;
DPRINT1("Last process in sessino %lu going down!!!\n", SessionId);
DPRINT1("Last process in session %lu going down!!!\n", SessionId);
/* Free the session page tables */
#ifndef _M_AMD64

10
reactos/ntoskrnl/ps/job.c
View file

@ -169,8 +169,7 @@ NtAssignProcessToJobObject (
ExAcquireRundownProtection(&Process->RundownProtect);
if(NT_SUCCESS(Status))
{
// FIXME: This is broken
if(Process->Job == NULL && PtrToUlong(Process->Session) == Job->SessionId)
if(Process->Job == NULL && PsGetProcessSessionId(Process) == Job->SessionId)
{
/* Just store the pointer to the job object in the process, we'll
assign it later. The reason we can't do this here is that locking
@ -272,9 +271,12 @@ NtCreateJobObject (
the list before it even gets added! */
Job->JobLinks.Flink = NULL;
/* setup the job object */
/* setup the job object - FIXME: More to do! */
InitializeListHead(&Job->JobSetLinks);
InitializeListHead(&Job->ProcessListHead);
Job->SessionId = PtrToUlong(CurrentProcess->Session); /* inherit the session id from the caller, FIXME: broken */
/* inherit the session id from the caller */
Job->SessionId = PsGetProcessSessionId(CurrentProcess);
Status = ExInitializeResource(&Job->JobLock);
if(!NT_SUCCESS(Status))

33
reactos/ntoskrnl/ps/query.c
View file

@ -1169,7 +1169,7 @@ NtSetInformationProcess(IN HANDLE ProcessHandle,
/* Getting VDM powers requires the SeTcbPrivilege */
if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode))
{
/* Bail out */
/* We don't hold the privilege, bail out */
Status = STATUS_PRIVILEGE_NOT_HELD;
DPRINT1("Need TCB privilege\n");
break;
@ -1213,7 +1213,7 @@ NtSetInformationProcess(IN HANDLE ProcessHandle,
/* Setting the error port requires the SeTcbPrivilege */
if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode))
{
/* Can't set the session ID, bail out. */
/* We don't hold the privilege, bail out */
Status = STATUS_PRIVILEGE_NOT_HELD;
break;
}
@ -1332,11 +1332,13 @@ NtSetInformationProcess(IN HANDLE ProcessHandle,
/* Setting the session id requires the SeTcbPrivilege */
if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode))
{
/* Can't set the session ID, bail out. */
/* We don't hold the privilege, bail out */
Status = STATUS_PRIVILEGE_NOT_HELD;
break;
}
#if 0 // OLD AND DEPRECATED CODE!!!!
/* FIXME - update the session id for the process token */
//Status = PsLockProcess(Process, FALSE);
if (!NT_SUCCESS(Status)) break;
@ -1372,6 +1374,27 @@ NtSetInformationProcess(IN HANDLE ProcessHandle,
/* Unlock the process */
//PsUnlockProcess(Process);
#endif
/*
* Since we cannot change the session ID of the given
* process anymore because it is set once and for all
* at process creation time and because it is stored
* inside the Process->Session structure managed by MM,
* we fake changing it: we just return success if the
* user-defined value is the same as the session ID of
* the process, and otherwise we fail.
*/
if (SessionInfo.SessionId == PsGetProcessSessionId(Process))
{
Status = STATUS_SUCCESS;
}
else
{
Status = STATUS_ACCESS_DENIED;
}
break;
case ProcessPriorityClass:
@ -1612,6 +1635,7 @@ NtSetInformationProcess(IN HANDLE ProcessHandle,
/* Setting 'break on termination' requires the SeDebugPrivilege */
if (!SeSinglePrivilegeCheck(SeDebugPrivilege, PreviousMode))
{
/* We don't hold the privilege, bail out */
Status = STATUS_PRIVILEGE_NOT_HELD;
break;
}
@ -1837,7 +1861,7 @@ NtSetInformationProcess(IN HANDLE ProcessHandle,
/* Only TCB can do this */
if (!SeSinglePrivilegeCheck(SeTcbPrivilege, PreviousMode))
{
/* Fail */
/* We don't hold the privilege, bail out */
DPRINT1("Need TCB to set IOPL\n");
Status = STATUS_PRIVILEGE_NOT_HELD;
break;
@ -2366,6 +2390,7 @@ NtSetInformationThread(IN HANDLE ThreadHandle,
/* Setting 'break on termination' requires the SeDebugPrivilege */
if (!SeSinglePrivilegeCheck(SeDebugPrivilege, PreviousMode))
{
/* We don't hold the privilege, bail out */
Status = STATUS_PRIVILEGE_NOT_HELD;
break;
}