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

Merge "Disable pointer authentication in app processes." am: 4b799b3691

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954983

Change-Id: Icbcc94245e6fcd5f4e2ad40f9a7e1d31af4278f2
This commit is contained in:
Peter Collingbourne
2022-01-24 21:33:42 +00:00
committed by Automerger Merge Worker
parent 0e5a1b21cf 4b799b3691
commit 373ab4c0d8
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmds/app_process/Android.bp
View File

@@ -64,6 +64,8 @@ cc_binary {
"libwilhelm", "libwilhelm",
], ],
header_libs: ["bionic_libc_platform_headers"],
compile_multilib: "both", compile_multilib: "both",
cflags: [ cflags: [

5
cmds/app_process/app_main.cpp
View File

@@ -15,6 +15,7 @@
#include <android-base/macros.h> #include <android-base/macros.h>
#include <binder/IPCThreadState.h> #include <binder/IPCThreadState.h>
#include <bionic/pac.h>
#include <hwbinder/IPCThreadState.h> #include <hwbinder/IPCThreadState.h>
#include <utils/Log.h> #include <utils/Log.h>
#include <cutils/memory.h> #include <cutils/memory.h>
@@ -182,6 +183,10 @@ int main(int argc, char* const argv[])
ALOGV("app_process main with argv: %s", argv_String.string()); ALOGV("app_process main with argv: %s", argv_String.string());
} }
// Because of applications that are using PAC instructions incorrectly, PAC
// is disabled in application processes for now.
ScopedDisablePAC x;
AppRuntime runtime(argv[0], computeArgBlockSize(argc, argv)); AppRuntime runtime(argv[0], computeArgBlockSize(argc, argv));
// Process command line arguments // Process command line arguments
// ignore argv[0] // ignore argv[0]