Chromium Code Reviews| Index: sandbox/win/src/target_process.cc |
| diff --git a/sandbox/win/src/target_process.cc b/sandbox/win/src/target_process.cc |
| index 2c5bf3b1f9736975baa9cadf3a558c01873a9c3a..5379c6d39f2a547e2a5faf5c3cb68566dea5027c 100644 |
| --- a/sandbox/win/src/target_process.cc |
| +++ b/sandbox/win/src/target_process.cc |
| @@ -14,6 +14,7 @@ |
| #include "sandbox/win/src/policy_low_level.h" |
| #include "sandbox/win/src/sandbox_types.h" |
| #include "sandbox/win/src/sharedmem_ipc_server.h" |
| +#include "sandbox/win/src/win_utils.h" |
| namespace { |
| @@ -134,21 +135,39 @@ DWORD TargetProcess::Create(const wchar_t* exe_path, |
| } |
| PROCESS_INFORMATION temp_process_info = {}; |
| - if (!::CreateProcessAsUserW(lockdown_token_.Get(), |
| - exe_path, |
| - cmd_line.get(), |
| - NULL, // No security attribute. |
| - NULL, // No thread attribute. |
| - inherit_handles, |
| - flags, |
| - NULL, // Use the environment of the caller. |
| - NULL, // Use current directory of the caller. |
| - startup_info.startup_info(), |
| - &temp_process_info)) { |
| - return ::GetLastError(); |
| + if (base::win::GetVersion() < base::win::VERSION_WIN8) { |
| + if (!::CreateProcessAsUserW(lockdown_token_.Get(), |
|
forshaw
2015/02/20 11:38:02
There was some discussion about doing this trick f
Shrikant Kelkar
2015/02/21 02:32:41
No, I haven't tested on other platforms. But to be
|
| + exe_path, |
| + cmd_line.get(), |
| + NULL, // No security attribute. |
| + NULL, // No thread attribute. |
| + inherit_handles, |
| + flags, |
| + NULL, // Use the environment of the caller. |
| + NULL, // Use current directory of the caller. |
| + startup_info.startup_info(), |
| + &temp_process_info)) { |
| + return ::GetLastError(); |
| + } |
| + lockdown_token_.Close(); |
| + } else { |
| + // For Windows 8 and above we will first create process with default token |
|
rvargas (doing something else)
2015/02/21 01:01:22
nit: create the process with a default... later, a
Shrikant Kelkar
2015/02/21 02:32:41
Done.
|
| + // and then replace it later after setting primary thread token. This is |
| + // required for setting app container token along with impersonation one. |
| + if (!::CreateProcess(exe_path, |
| + cmd_line.get(), |
| + NULL, // No security attribute. |
| + NULL, // No thread attribute. |
| + inherit_handles, |
| + flags, |
| + NULL, // Use the environment of the caller. |
| + NULL, // Use current directory of the caller. |
| + startup_info.startup_info(), |
| + &temp_process_info)) { |
| + return ::GetLastError(); |
| + } |
| } |
| base::win::ScopedProcessInformation process_info(temp_process_info); |
| - lockdown_token_.Close(); |
| DWORD win_result = ERROR_SUCCESS; |
| @@ -176,6 +195,26 @@ DWORD TargetProcess::Create(const wchar_t* exe_path, |
| initial_token_.Close(); |
| } |
| + if (base::win::GetVersion() >= base::win::VERSION_WIN8) { |
| + PROCESS_ACCESS_TOKEN process_access_token; |
| + process_access_token.thread = process_info.thread_handle(); |
| + process_access_token.token = lockdown_token_.Get(); |
| + |
| + NtSetInformationProcess SetInformationProcess = NULL; |
| + ResolveNTFunctionPtr("NtSetInformationProcess", &SetInformationProcess); |
| + |
| + NTSTATUS status = SetInformationProcess( |
| + process_info.process_handle(), |
| + static_cast<PROCESS_INFORMATION_CLASS>(NtProcessInformationAccessToken), |
| + &process_access_token, |
| + sizeof(process_access_token)); |
| + if (!NT_SUCCESS(status)) { |
|
forshaw
2015/02/20 11:38:02
Missing a call to lockdown_token_.Close() for this
Will Harris
2015/02/21 01:13:15
This should get closed in TargetProcess descructor
rvargas (doing something else)
2015/02/21 01:26:01
Yes, not leaking. I thought that for some reason w
Shrikant Kelkar
2015/02/21 02:32:41
Done.
Shrikant Kelkar
2015/02/21 02:32:41
Done.
Shrikant Kelkar
2015/02/21 02:32:41
Done.
|
| + win_result = ::GetLastError(); |
| + ::TerminateProcess(process_info.process_handle(), 0); // exit code |
| + return win_result; |
| + } |
| + } |
| + |
| CONTEXT context; |
| context.ContextFlags = CONTEXT_ALL; |
| if (!::GetThreadContext(process_info.thread_handle(), &context)) { |