Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "app_main: failure to PR_SET_NO_NEW_PRIVS is always fatal."

Browse Source 
am: 796578f9a9

Change-Id: I74c142183c3632f725b6992388235ad8e59bc389
This commit is contained in:
Narayan Kamath
2016-09-14 13:15:51 +00:00
committed by android-build-merger
parent 506bf0741a 796578f9a9
commit 2b283bd24f
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmds/app_process/app_main.cpp
View File

@@ -185,12 +185,7 @@ static const char ZYGOTE_NICE_NAME[] = "zygote";
int main(int argc, char* const argv[]) int main(int argc, char* const argv[])
{ {
if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) < 0) { if (prctl(PR_SET_NO_NEW_PRIVS, 1, 0, 0, 0) < 0) {
// Older kernels don't understand PR_SET_NO_NEW_PRIVS and return LOG_ALWAYS_FATAL("PR_SET_NO_NEW_PRIVS failed: %s", strerror(errno));
// EINVAL. Don't die on such kernels.
if (errno != EINVAL) {
LOG_ALWAYS_FATAL("PR_SET_NO_NEW_PRIVS failed: %s", strerror(errno));
return 12;
}
} }
AppRuntime runtime(argv[0], computeArgBlockSize(argc, argv)); AppRuntime runtime(argv[0], computeArgBlockSize(argc, argv));
@@ -309,6 +304,5 @@ int main(int argc, char* const argv[])
fprintf(stderr, "Error: no class name or --zygote supplied.\n"); fprintf(stderr, "Error: no class name or --zygote supplied.\n");
app_usage(); app_usage();
LOG_ALWAYS_FATAL("app_process: no class name or --zygote supplied."); LOG_ALWAYS_FATAL("app_process: no class name or --zygote supplied.");
return 10;
} }
} }