Skip to content

Codex-generated pull request #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Endlad2 wants to merge 1 commit into from
Closed

Codex-generated pull request #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions sdk/include/reactos/subsys/csr/csrsrv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,15 @@ typedef struct _CSR_NT_SESSION
ULONG ReferenceCount;
LIST_ENTRY SessionLink;
ULONG SessionId;
ULONG Flags;
} CSR_NT_SESSION, *PCSR_NT_SESSION;

typedef enum _CSR_NT_SESSION_FLAGS
{
CsrNtSessionTerminating = 0x1,
CsrNtSessionForeignCompleted = 0x2
} CSR_NT_SESSION_FLAGS;

typedef struct _CSR_PROCESS
{
CLIENT_ID ClientId;
Expand Down
292 changes: 288 additions & 4 deletions subsystems/csr/csrsrv/session.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,101 @@ CsrDereferenceNtSession(IN PCSR_NT_SESSION Session,

/* SESSION MANAGER FUNCTIONS **************************************************/


static
PCSR_NT_SESSION
NTAPI
CsrLocateNtSessionById(IN ULONG SessionId,
IN BOOLEAN ReferenceSession)
{
PLIST_ENTRY NextEntry;
PCSR_NT_SESSION NtSession = NULL;

CsrAcquireNtSessionLock();

NextEntry = CsrNtSessionList.Flink;
while (NextEntry != &CsrNtSessionList)
{
NtSession = CONTAINING_RECORD(NextEntry, CSR_NT_SESSION, SessionLink);
if (NtSession->SessionId == SessionId)
{
if (ReferenceSession) NtSession->ReferenceCount++;
break;
}

NtSession = NULL;
NextEntry = NextEntry->Flink;
}

CsrReleaseNtSessionLock();
return NtSession;
}

static
NTSTATUS
NTAPI
CsrGetProcessSessionId(IN HANDLE ProcessHandle,
OUT PULONG SessionId)
{
PROCESS_SESSION_INFORMATION SessionInformation;
NTSTATUS Status;

Status = NtQueryInformationProcess(ProcessHandle,
ProcessSessionInformation,
&SessionInformation,
sizeof(SessionInformation),
NULL);
if (!NT_SUCCESS(Status)) return Status;

*SessionId = SessionInformation.SessionId;
return STATUS_SUCCESS;
}

static
NTSTATUS
NTAPI
CsrReferenceSingleActiveNtSession(OUT PCSR_NT_SESSION *NtSession)
{
PLIST_ENTRY NextEntry;
PCSR_NT_SESSION CurrentSession = NULL;

*NtSession = NULL;

CsrAcquireNtSessionLock();

NextEntry = CsrNtSessionList.Flink;
while (NextEntry != &CsrNtSessionList)
{
CurrentSession = CONTAINING_RECORD(NextEntry, CSR_NT_SESSION, SessionLink);

if (!(CurrentSession->Flags & CsrNtSessionTerminating))
{
if (*NtSession)
{
CsrReleaseNtSessionLock();
DPRINT1("CSRSS: Multiple active NT sessions present, cannot pick a unique target\n");
return STATUS_INVALID_PARAMETER;
}

CurrentSession->ReferenceCount++;
*NtSession = CurrentSession;
}

NextEntry = NextEntry->Flink;
}

CsrReleaseNtSessionLock();

if (!*NtSession)
{
DPRINT1("CSRSS: No active NT session available for process creation\n");
return STATUS_NOT_FOUND;
}

return STATUS_SUCCESS;
}


/*++
* @name CsrSbCreateSession
*
Expand Down Expand Up @@ -364,8 +459,23 @@ BOOLEAN
NTAPI
CsrSbForeignSessionComplete(IN PSB_API_MSG ApiMessage)
{
/* Deprecated/Unimplemented in NT */
ApiMessage->ReturnValue = STATUS_NOT_IMPLEMENTED;
ULONG SessionId = ApiMessage->u.ForeignSessionComplete.SessionId;
PCSR_NT_SESSION NtSession;

NtSession = CsrLocateNtSessionById(SessionId, FALSE);
if (!NtSession)
{
DPRINT1("CSRSS: SbForeignSessionComplete for unknown session %lu\n", SessionId);
ApiMessage->ReturnValue = STATUS_NOT_FOUND;
return TRUE;
}

CsrAcquireNtSessionLock();
NtSession->Flags |= CsrNtSessionForeignCompleted;
CsrReleaseNtSessionLock();

DPRINT1("CSRSS: SbForeignSessionComplete for session %lu\n", SessionId);
ApiMessage->ReturnValue = STATUS_SUCCESS;
return TRUE;
}

Expand All @@ -387,7 +497,111 @@ BOOLEAN
NTAPI
CsrSbTerminateSession(IN PSB_API_MSG ApiMessage)
{
ApiMessage->ReturnValue = STATUS_NOT_IMPLEMENTED;
PCSR_NT_SESSION NtSession;
PCSR_PROCESS CsrProcess;
PLIST_ENTRY NextEntry;
NTSTATUS Status = STATUS_SUCCESS;
NTSTATUS LocalStatus;
LARGE_INTEGER Timeout;
ULONG SessionId = ApiMessage->u.TerminateSession.SessionId;

NtSession = CsrLocateNtSessionById(SessionId, TRUE);
if (!NtSession)
{
DPRINT1("CSRSS: SbTerminateSession for unknown session %lu\n", SessionId);
ApiMessage->ReturnValue = STATUS_NOT_FOUND;
return TRUE;
}

CsrAcquireNtSessionLock();
NtSession->Flags |= CsrNtSessionTerminating;
CsrReleaseNtSessionLock();

DPRINT1("CSRSS: SbTerminateSession start for session %lu\n", SessionId);

CsrAcquireProcessLock();
NextEntry = CsrRootProcess->ListLink.Flink;
while (NextEntry != &CsrRootProcess->ListLink)
{
CsrProcess = CONTAINING_RECORD(NextEntry, CSR_PROCESS, ListLink);
NextEntry = NextEntry->Flink;

if (CsrProcess->NtSession != NtSession) continue;

CsrLockedReferenceProcess(CsrProcess);
CsrReleaseProcessLock();

DPRINT1("CSRSS: Terminating session %lu process PID=%p\n",
SessionId,
CsrProcess->ClientId.UniqueProcess);

LocalStatus = CsrDestroyProcess(&CsrProcess->ClientId, STATUS_SUCCESS);
if (!NT_SUCCESS(LocalStatus) && (LocalStatus != STATUS_THREAD_IS_TERMINATING))
{
DPRINT1("CSRSS: CsrDestroyProcess failed for PID=%p with status %lx\n",
CsrProcess->ClientId.UniqueProcess,
LocalStatus);
Status = LocalStatus;
}

Timeout.QuadPart = Int32x32To64(-1, 2 * 1000 * 1000 * 10);
LocalStatus = NtWaitForSingleObject(CsrProcess->ProcessHandle, FALSE, &Timeout);
if (LocalStatus == STATUS_TIMEOUT)
{
DPRINT1("CSRSS: Session %lu process PID=%p timed out; force-kill\n",
SessionId,
CsrProcess->ClientId.UniqueProcess);

LocalStatus = NtTerminateProcess(CsrProcess->ProcessHandle,
STATUS_PROCESS_IS_TERMINATING);
if (!NT_SUCCESS(LocalStatus))
{
DPRINT1("CSRSS: Force-kill failed for PID=%p with status %lx\n",
CsrProcess->ClientId.UniqueProcess,
LocalStatus);
Status = LocalStatus;
}
else
{
Timeout.QuadPart = Int32x32To64(-1, 1 * 1000 * 1000 * 10);
LocalStatus = NtWaitForSingleObject(CsrProcess->ProcessHandle,
FALSE,
&Timeout);
if (!NT_SUCCESS(LocalStatus))
{
DPRINT1("CSRSS: Post kill wait failed for PID=%p with status %lx\n",
CsrProcess->ClientId.UniqueProcess,
LocalStatus);
Status = LocalStatus;
}
}
}
else if (!NT_SUCCESS(LocalStatus))
{
DPRINT1("CSRSS: Wait failed for PID=%p with status %lx\n",
CsrProcess->ClientId.UniqueProcess,
LocalStatus);
Status = LocalStatus;
}
else
{
DPRINT("CSRSS: Session %lu process PID=%p terminated cleanly\n",
SessionId,
CsrProcess->ClientId.UniqueProcess);
}

CsrDereferenceProcess(CsrProcess);
CsrAcquireProcessLock();
}
CsrReleaseProcessLock();

CsrDereferenceNtSession(NtSession, Status);

DPRINT1("CSRSS: SbTerminateSession complete for session %lu status %lx\n",
SessionId,
Status);

ApiMessage->ReturnValue = Status;
return TRUE;
}

Expand All @@ -409,7 +623,77 @@ BOOLEAN
NTAPI
CsrSbCreateProcess(IN PSB_API_MSG ApiMessage)
{
ApiMessage->ReturnValue = STATUS_NOT_IMPLEMENTED;
PSB_CREATE_PROCESS_MSG CreateProcess = &ApiMessage->u.CreateProcess;
PCSR_NT_SESSION NtSession;
NTSTATUS Status;
ULONG ProcessSessionId;

Status = CsrReferenceSingleActiveNtSession(&NtSession);
if (!NT_SUCCESS(Status))
{
ApiMessage->ReturnValue = Status;
return TRUE;
}

if (!CreateProcess->Out.ProcessHandle ||
!CreateProcess->Out.ThreadHandle ||
!CreateProcess->Out.ClientId.UniqueProcess ||
!CreateProcess->Out.ClientId.UniqueThread)
{
DPRINT1("CSRSS: SbCreateProcess in image-launch mode is not yet supported; session %lu\n",
NtSession->SessionId);
CsrDereferenceNtSession(NtSession, STATUS_SUCCESS);
ApiMessage->ReturnValue = STATUS_NOT_IMPLEMENTED;
return TRUE;
}

Status = CsrGetProcessSessionId(CreateProcess->Out.ProcessHandle,
&ProcessSessionId);
if (!NT_SUCCESS(Status))
{
DPRINT1("CSRSS: SbCreateProcess failed to query process session for PID=%p: %lx\n",
CreateProcess->Out.ClientId.UniqueProcess,
Status);
CsrDereferenceNtSession(NtSession, STATUS_SUCCESS);
ApiMessage->ReturnValue = Status;
return TRUE;
}

if (ProcessSessionId != NtSession->SessionId)
{
DPRINT1("CSRSS: SbCreateProcess inconsistent session. expected=%lu actual=%lu PID=%p\n",
NtSession->SessionId,
ProcessSessionId,
CreateProcess->Out.ClientId.UniqueProcess);
CsrDereferenceNtSession(NtSession, STATUS_SUCCESS);
ApiMessage->ReturnValue = STATUS_INVALID_PARAMETER;
return TRUE;
}

Status = CsrCreateProcess(CreateProcess->Out.ProcessHandle,
CreateProcess->Out.ThreadHandle,
&CreateProcess->Out.ClientId,
NtSession,
0,
NULL);

CsrDereferenceNtSession(NtSession, STATUS_SUCCESS);

if (!NT_SUCCESS(Status))
{
DPRINT1("CSRSS: SbCreateProcess failed for PID=%p session=%lu status=%lx\n",
CreateProcess->Out.ClientId.UniqueProcess,
ProcessSessionId,
Status);
}
else
{
DPRINT("CSRSS: SbCreateProcess success for PID=%p session=%lu\n",
CreateProcess->Out.ClientId.UniqueProcess,
ProcessSessionId);
}

ApiMessage->ReturnValue = Status;
return TRUE;
}

Expand Down
4 changes: 2 additions & 2 deletions subsystems/csr/csrsrv/status.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@
/* Public SB API Interface Status (session.c)
* CsrSbCreateSession - IMPLEMENTED
* CsrSbForeignSessionComplete - IMPLEMENTED
* CsrSbTerminateSession - UNIMPLEMENTED
* CsrSbCreateProcess - UNIMPLEMENTED
* CsrSbTerminateSession - IMPLEMENTED
* CsrSbCreateProcess - PARTLY_IMPLEMENTED
*/

/* What's missing:
Expand Down