Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-06-07 20:42:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

launcher: code cleanup

Browse Source
This commit is contained in:
Bill Zissimopoulos 2018-01-03 14:55:27 -08:00
parent d9c450ecf4
commit 2f026cbc6f
No known key found for this signature in database
GPG Key ID: 3D4F95D52C7B3EA3
1 changed files with 55 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
src/launcher/launcher.c
View File

@ -29,7 +29,7 @@ static NTSTATUS (NTAPI *SvcNtOpenSymbolicLinkObject)(
static NTSTATUS (NTAPI *SvcNtClose)( static NTSTATUS (NTAPI *SvcNtClose)(
HANDLE Handle); HANDLE Handle);
BOOL CreateOverlappedPipe( static BOOL CreateOverlappedPipe(
PHANDLE PReadPipe, PHANDLE PWritePipe, PHANDLE PReadPipe, PHANDLE PWritePipe,
DWORD Size, DWORD Size,
BOOL ReadInherit, BOOL WriteInherit, BOOL ReadInherit, BOOL WriteInherit,
@ -82,7 +82,12 @@ BOOL CreateOverlappedPipe(
static NTSTATUS GetTokenUserName(HANDLE Token, PWSTR *PUserName) static NTSTATUS GetTokenUserName(HANDLE Token, PWSTR *PUserName)
{ {
TOKEN_USER *User = 0; union
{
TOKEN_USER V;
UINT8 B[128];
} UserInfoBuf;
PTOKEN_USER UserInfo = &UserInfoBuf.V;
WCHAR Name[256], Domn[256]; WCHAR Name[256], Domn[256];
DWORD UserSize, NameSize, DomnSize; DWORD UserSize, NameSize, DomnSize;
SID_NAME_USE Use; SID_NAME_USE Use;
@ -91,33 +96,31 @@ static NTSTATUS GetTokenUserName(HANDLE Token, PWSTR *PUserName)
*PUserName = 0; *PUserName = 0;
if (GetTokenInformation(Token, TokenUser, 0, 0, &UserSize)) if (!GetTokenInformation(Token, TokenUser, UserInfo, sizeof UserInfoBuf, &UserSize))
{ {
Result = STATUS_INVALID_PARAMETER; if (ERROR_INSUFFICIENT_BUFFER != GetLastError())
goto exit; {
} Result = FspNtStatusFromWin32(GetLastError());
if (ERROR_INSUFFICIENT_BUFFER != GetLastError()) goto exit;
{ }
Result = FspNtStatusFromWin32(GetLastError());
goto exit;
}
User = MemAlloc(UserSize); UserInfo = MemAlloc(UserSize);
if (0 == User) if (0 == UserInfo)
{ {
Result = STATUS_INSUFFICIENT_RESOURCES; Result = STATUS_INSUFFICIENT_RESOURCES;
goto exit; goto exit;
} }
if (!GetTokenInformation(Token, TokenUser, User, UserSize, &UserSize)) if (!GetTokenInformation(Token, TokenUser, UserInfo, UserSize, &UserSize))
{ {
Result = FspNtStatusFromWin32(GetLastError()); Result = FspNtStatusFromWin32(GetLastError());
goto exit; goto exit;
}
} }
NameSize = sizeof Name / sizeof Name[0]; NameSize = sizeof Name / sizeof Name[0];
DomnSize = sizeof Domn / sizeof Domn[0]; DomnSize = sizeof Domn / sizeof Domn[0];
if (!LookupAccountSidW(0, User->User.Sid, Name, &NameSize, Domn, &DomnSize, &Use)) if (!LookupAccountSidW(0, UserInfo->User.Sid, Name, &NameSize, Domn, &DomnSize, &Use))
{ {
Result = FspNtStatusFromWin32(GetLastError()); Result = FspNtStatusFromWin32(GetLastError());
goto exit; goto exit;
@ -145,42 +148,46 @@ static NTSTATUS GetTokenUserName(HANDLE Token, PWSTR *PUserName)
Result = STATUS_SUCCESS; Result = STATUS_SUCCESS;
exit: exit:
MemFree(User); if (UserInfo != &UserInfoBuf.V)
MemFree(UserInfo);
return Result; return Result;
} }
static NTSTATUS AddAccessForTokenUser(HANDLE Handle, DWORD Access, HANDLE Token) static NTSTATUS AddAccessForTokenUser(HANDLE Handle, DWORD Access, HANDLE Token)
{ {
TOKEN_USER *User = 0; union
{
TOKEN_USER V;
UINT8 B[128];
} UserInfoBuf;
PTOKEN_USER UserInfo = &UserInfoBuf.V;
PSECURITY_DESCRIPTOR SecurityDescriptor = 0; PSECURITY_DESCRIPTOR SecurityDescriptor = 0;
PSECURITY_DESCRIPTOR NewSecurityDescriptor = 0; PSECURITY_DESCRIPTOR NewSecurityDescriptor = 0;
EXPLICIT_ACCESSW AccessEntry; EXPLICIT_ACCESSW AccessEntry;
DWORD Size, LastError; DWORD Size, LastError;
NTSTATUS Result; NTSTATUS Result;
if (GetTokenInformation(Token, TokenUser, 0, 0, &Size)) if (!GetTokenInformation(Token, TokenUser, UserInfo, sizeof UserInfoBuf, &Size))
{ {
Result = STATUS_INVALID_PARAMETER; if (ERROR_INSUFFICIENT_BUFFER != GetLastError())
goto exit; {
} Result = FspNtStatusFromWin32(GetLastError());
if (ERROR_INSUFFICIENT_BUFFER != GetLastError()) goto exit;
{ }
Result = FspNtStatusFromWin32(GetLastError());
goto exit;
}
User = MemAlloc(Size); UserInfo = MemAlloc(Size);
if (0 == User) if (0 == UserInfo)
{ {
Result = STATUS_INSUFFICIENT_RESOURCES; Result = STATUS_INSUFFICIENT_RESOURCES;
goto exit; goto exit;
} }
if (!GetTokenInformation(Token, TokenUser, User, Size, &Size)) if (!GetTokenInformation(Token, TokenUser, UserInfo, Size, &Size))
{ {
Result = FspNtStatusFromWin32(GetLastError()); Result = FspNtStatusFromWin32(GetLastError());
goto exit; goto exit;
}
} }
if (GetKernelObjectSecurity(Handle, DACL_SECURITY_INFORMATION, 0, 0, &Size)) if (GetKernelObjectSecurity(Handle, DACL_SECURITY_INFORMATION, 0, 0, &Size))
@ -214,7 +221,7 @@ static NTSTATUS AddAccessForTokenUser(HANDLE Handle, DWORD Access, HANDLE Token)
AccessEntry.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE; AccessEntry.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
AccessEntry.Trustee.TrusteeForm = TRUSTEE_IS_SID; AccessEntry.Trustee.TrusteeForm = TRUSTEE_IS_SID;
AccessEntry.Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN; AccessEntry.Trustee.TrusteeType = TRUSTEE_IS_UNKNOWN;
AccessEntry.Trustee.ptstrName = User->User.Sid; AccessEntry.Trustee.ptstrName = UserInfo->User.Sid;
LastError = BuildSecurityDescriptorW(0, 0, 1, &AccessEntry, 0, 0, SecurityDescriptor, LastError = BuildSecurityDescriptorW(0, 0, 1, &AccessEntry, 0, 0, SecurityDescriptor,
&Size, &NewSecurityDescriptor); &Size, &NewSecurityDescriptor);
@ -235,7 +242,8 @@ static NTSTATUS AddAccessForTokenUser(HANDLE Handle, DWORD Access, HANDLE Token)
exit: exit:
LocalFree(NewSecurityDescriptor); LocalFree(NewSecurityDescriptor);
MemFree(SecurityDescriptor); MemFree(SecurityDescriptor);
MemFree(User); if (UserInfo != &UserInfoBuf.V)
MemFree(UserInfo);
return Result; return Result;
} }
@ -353,7 +361,7 @@ typedef struct
static VOID CALLBACK KillProcessWait(PVOID Context, BOOLEAN Timeout); static VOID CALLBACK KillProcessWait(PVOID Context, BOOLEAN Timeout);
VOID KillProcess(ULONG ProcessId, HANDLE Process, ULONG Timeout) static VOID KillProcess(ULONG ProcessId, HANDLE Process, ULONG Timeout)
{ {
if (GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, ProcessId)) if (GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, ProcessId))
{ {
@ -645,7 +653,7 @@ static NTSTATUS SvcInstanceAccessCheck(HANDLE ClientToken, ULONG DesiredAccess,
return Result; return Result;
} }
NTSTATUS SvcInstanceCreateProcess(PWSTR UserName, static NTSTATUS SvcInstanceCreateProcess(PWSTR UserName,
PWSTR Executable, PWSTR CommandLine, PWSTR WorkDirectory, PWSTR Executable, PWSTR CommandLine, PWSTR WorkDirectory,
HANDLE StdioHandles[2], HANDLE StdioHandles[2],
PPROCESS_INFORMATION ProcessInfo) PPROCESS_INFORMATION ProcessInfo)