Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-22 13:10:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CONSRV]

Browse source 
Modify driver acquiring/releasing privilege according to r58233. The corresponding modification in services.c will be done at the next synchronization.

svn path=/branches/ros-csrss/; revision=58234
This commit is contained in:
Hermès Bélusca-Maïto 2013-01-26 23:16:34 +00:00
parent b75ee7fd14
commit 49ea03a6b9
1 changed files with 32 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
win32ss/user/consrv/tuiconsole.c
View file

@ -29,56 +29,13 @@ static BOOL ConsInitialized = FALSE;
|** BlueScreen Driver management **| |** BlueScreen Driver management **|
\**/ \**/
/* Code taken and adapted from base/system/services/driver.c */ /* Code taken and adapted from base/system/services/driver.c */
static DWORD EnablePrivilege(LPCWSTR lpszPrivilegeName, BOOL bEnablePrivilege)
{
DWORD dwRet = ERROR_SUCCESS;
HANDLE hToken = NULL;
if (OpenProcessToken(GetCurrentProcess(),
TOKEN_ADJUST_PRIVILEGES,
&hToken))
{
TOKEN_PRIVILEGES tp;
tp.PrivilegeCount = 1;
tp.Privileges[0].Attributes = (bEnablePrivilege ? SE_PRIVILEGE_ENABLED : 0);
if (LookupPrivilegeValueW(NULL,
lpszPrivilegeName,
&tp.Privileges[0].Luid))
{
if (AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL))
{
if (GetLastError() == ERROR_NOT_ALL_ASSIGNED)
dwRet = ERROR_NOT_ALL_ASSIGNED;
}
else
{
dwRet = GetLastError();
}
}
else
{
dwRet = GetLastError();
}
CloseHandle(hToken);
}
else
{
dwRet = GetLastError();
}
return dwRet;
}
static DWORD static DWORD
ScmLoadDriver(LPCWSTR lpServiceName) ScmLoadDriver(LPCWSTR lpServiceName)
{ {
NTSTATUS Status = STATUS_SUCCESS;
BOOLEAN WasPrivilegeEnabled = FALSE;
PWSTR pszDriverPath; PWSTR pszDriverPath;
UNICODE_STRING DriverPath; UNICODE_STRING DriverPath;
NTSTATUS Status;
DWORD dwError = ERROR_SUCCESS;
/* Build the driver path */ /* Build the driver path */
/* 52 = wcslen(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\") */ /* 52 = wcslen(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\") */
@ -99,38 +56,38 @@ ScmLoadDriver(LPCWSTR lpServiceName)
DPRINT(" Path: %wZ\n", &DriverPath); DPRINT(" Path: %wZ\n", &DriverPath);
/* Acquire driver-loading privilege */ /* Acquire driver-loading privilege */
dwError = EnablePrivilege(SE_LOAD_DRIVER_NAME, TRUE); Status = RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE,
if (dwError != ERROR_SUCCESS) TRUE,
FALSE,
&WasPrivilegeEnabled);
if (!NT_SUCCESS(Status))
{ {
/* We encountered a failure, exit properly */ /* We encountered a failure, exit properly */
DPRINT1("CONSRV: Cannot acquire driver-loading privilege, error = %lu\n", dwError); DPRINT1("CONSRV: Cannot acquire driver-loading privilege, Status = 0x%08lx\n", Status);
goto done; goto done;
} }
Status = NtLoadDriver(&DriverPath); Status = NtLoadDriver(&DriverPath);
/* Release driver-loading privilege */ /* Release driver-loading privilege */
EnablePrivilege(SE_LOAD_DRIVER_NAME, FALSE); RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE,
WasPrivilegeEnabled,
if (!NT_SUCCESS(Status)) FALSE,
{ &WasPrivilegeEnabled);
dwError = RtlNtStatusToDosError(Status);
}
done: done:
RtlFreeHeap(ConSrvHeap, 0, pszDriverPath); RtlFreeHeap(ConSrvHeap, 0, pszDriverPath);
return RtlNtStatusToDosError(Status);
return dwError;
} }
#ifdef BLUESCREEN_DRIVER_UNLOADING #ifdef BLUESCREEN_DRIVER_UNLOADING
static DWORD static DWORD
ScmUnloadDriver(LPCWSTR lpServiceName) ScmUnloadDriver(LPCWSTR lpServiceName)
{ {
NTSTATUS Status = STATUS_SUCCESS;
BOOLEAN WasPrivilegeEnabled = FALSE;
PWSTR pszDriverPath; PWSTR pszDriverPath;
UNICODE_STRING DriverPath; UNICODE_STRING DriverPath;
NTSTATUS Status;
DWORD dwError = ERROR_SUCCESS;
/* Build the driver path */ /* Build the driver path */
/* 52 = wcslen(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\") */ /* 52 = wcslen(L"\\Registry\\Machine\\System\\CurrentControlSet\\Services\\") */
@ -148,29 +105,31 @@ ScmUnloadDriver(LPCWSTR lpServiceName)
RtlInitUnicodeString(&DriverPath, RtlInitUnicodeString(&DriverPath,
pszDriverPath); pszDriverPath);
DPRINT(" Path: %wZ\n", &DriverPath);
/* Acquire driver-unloading privilege */ /* Acquire driver-unloading privilege */
dwError = EnablePrivilege(SE_LOAD_DRIVER_NAME, TRUE); Status = RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE,
if (dwError != ERROR_SUCCESS) TRUE,
FALSE,
&WasPrivilegeEnabled);
if (!NT_SUCCESS(Status))
{ {
/* We encountered a failure, exit properly */ /* We encountered a failure, exit properly */
DPRINT1("CONSRV: Cannot acquire driver-unloading privilege, error = %lu\n", dwError); DPRINT1("CONSRV: Cannot acquire driver-unloading privilege, Status = 0x%08lx\n", Status);
goto done; goto done;
} }
Status = NtUnloadDriver(&DriverPath); Status = NtUnloadDriver(&DriverPath);
/* Release driver-unloading privilege */ /* Release driver-unloading privilege */
EnablePrivilege(SE_LOAD_DRIVER_NAME, FALSE); RtlAdjustPrivilege(SE_LOAD_DRIVER_PRIVILEGE,
WasPrivilegeEnabled,
if (!NT_SUCCESS(Status)) FALSE,
{ &WasPrivilegeEnabled);
dwError = RtlNtStatusToDosError(Status);
}
done: done:
RtlFreeHeap(ConSrvHeap, 0, pszDriverPath); RtlFreeHeap(ConSrvHeap, 0, pszDriverPath);
return RtlNtStatusToDosError(Status);
return dwError;
} }
#endif #endif
/**\ /**\