Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-11228. Winutils task: unsecure path should not call AddNodeManagerAndUserACEsToObject. Contributed by Remus Rusanu 

(cherry picked from commit f7e89bb349)

Conflicts:
	hadoop-common-project/hadoop-common/CHANGES.txt
This commit is contained in:
Jian He 2014-10-24 12:48:57 -07:00
parent 5fb7660ad6
commit 299c9b456d
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -661,6 +661,9 @@ Release 2.6.0 - UNRELEASED
HADOOP-11122. Fix findbugs in ZK DelegationTokenSecretManagers. HADOOP-11122. Fix findbugs in ZK DelegationTokenSecretManagers.
(Arun Suresh via kasha) (Arun Suresh via kasha)
HADOOP-11228. Winutils task: unsecure path should not call
AddNodeManagerAndUserACEsToObject. (Remus Rusanu via jianhe)
Release 2.5.1 - 2014-09-05 Release 2.5.1 - 2014-09-05
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

4
hadoop-common-project/hadoop-common/src/main/winutils/task.c
View File

@ -627,12 +627,14 @@ DWORD CreateTaskImpl(__in_opt HANDLE logonHandle, __in PCWSTR jobObjName,__in PC
return dwErrorCode; return dwErrorCode;
} }
if (logonHandle != NULL) {
dwErrorCode = AddNodeManagerAndUserACEsToObject(jobObject, userName, JOB_OBJECT_ALL_ACCESS); dwErrorCode = AddNodeManagerAndUserACEsToObject(jobObject, userName, JOB_OBJECT_ALL_ACCESS);
if (dwErrorCode) { if (dwErrorCode) {
ReportErrorCode(L"AddNodeManagerAndUserACEsToObject", dwErrorCode); ReportErrorCode(L"AddNodeManagerAndUserACEsToObject", dwErrorCode);
CloseHandle(jobObject); CloseHandle(jobObject);
return dwErrorCode; return dwErrorCode;
} }
}
if(AssignProcessToJobObject(jobObject, GetCurrentProcess()) == 0) if(AssignProcessToJobObject(jobObject, GetCurrentProcess()) == 0)
{ {
@ -706,6 +708,8 @@ DWORD CreateTaskImpl(__in_opt HANDLE logonHandle, __in PCWSTR jobObjName,__in PC
dwErrorCode = GetLastError(); dwErrorCode = GetLastError();
ReportErrorCode(L"CreateProcess", dwErrorCode); ReportErrorCode(L"CreateProcess", dwErrorCode);
} }
// task create (w/o createAsUser) does not need the ACEs change on the process
goto create_process_done; goto create_process_done;
} }