summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2022-12-27 21:51:03 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-12-27 21:51:03 +0000
commit8210e93f7d45553ebe72b4ce004f33e5476bbc3a (patch)
tree6d533759ae0568c9f24bff772c68f5859ddb6ff0
parentb453c9755fb6f7cd711e544d8808ee2d15990395 (diff)
parentd5c19f32f60a76dcc6e87625460a052df8db4df9 (diff)
downloadlibhwbinder-8210e93f7d45553ebe72b4ce004f33e5476bbc3a.tar.gz
stack guard - use __builtin_frame_address(0) am: d5c19f32f6
Original change: https://android-review.googlesource.com/c/platform/system/libhwbinder/+/2368830 Change-Id: I6d2c2e6cef5e6d1df0e23d5589625cc093606c72 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--IPCThreadState.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/IPCThreadState.cpp b/IPCThreadState.cpp
index aa050fc..8631644 100644
--- a/IPCThreadState.cpp
+++ b/IPCThreadState.cpp
@@ -1147,7 +1147,7 @@ status_t IPCThreadState::executeCommand(int32_t cmd)
tr.offsets_size/sizeof(binder_size_t), freeBuffer, this);
const void* origServingStackPointer = mServingStackPointer;
- mServingStackPointer = &origServingStackPointer; // anything on the stack
+ mServingStackPointer = __builtin_frame_address(0);
const pid_t origPid = mCallingPid;
const char* origSid = mCallingSid;