Snap for 12391343 from 9c963e13d6 to 24Q4-release

Change-Id: Iff82b91919595785a2cf21e372f89ed8d54b35ef
This commit is contained in:
Android Build Coastguard Worker 2024-09-19 23:24:22 +00:00
commit 2a68247ae5
2 changed files with 3 additions and 4 deletions

View file

@ -838,7 +838,6 @@ void debuggerd_init(debuggerd_callbacks_t* callbacks) {
// Use the alternate signal stack if available so we can catch stack overflows.
action.sa_flags |= SA_ONSTACK;
#define SA_EXPOSE_TAGBITS 0x00000800
// Request that the kernel set tag bits in the fault address. This is necessary for diagnosing MTE
// faults.
action.sa_flags |= SA_EXPOSE_TAGBITS;

View file

@ -1,6 +1,6 @@
service system.keymint.rust-trusty.nonsecure \
/system_ext/bin/hw/android.hardware.security.keymint-service.rust.trusty.system.nonsecure \
--dev ${ro.hardware.trusty_ipc_dev.keymint:-/dev/trusty-ipc-dev0}
--dev ${system.keymint.trusty_ipc_dev:-/dev/trusty-ipc-dev0}
disabled
user nobody
group drmrpc
@ -12,6 +12,6 @@ service system.keymint.rust-trusty.nonsecure \
# TODO(b/357821690): Start the KeyMint HALs when the KeyMint VM is ready once the Trusty VM
# has a mechanism to notify the host.
on late-fs && property:ro.hardware.security.keymint.trusty.system=1 && \
property:ro.hardware.trusty_vm_cid=*
setprop ro.hardware.trusty_ipc_dev.keymint VSOCK:${ro.hardware.trusty_vm_cid}:1
property:trusty_vm_system.vm_cid=*
setprop system.keymint.trusty_ipc_dev VSOCK:${trusty_vm_system.vm_cid}:1
start system.keymint.rust-trusty.nonsecure