diff options
| author | 2023-12-06 23:27:41 +0000 | |
|---|---|---|
| committer | 2023-12-06 23:27:41 +0000 | |
| commit | 5f0b2e194da681d4bf9f98d8897f645099033ca0 (patch) | |
| tree | be315bad9b0f23354909cb80299c08dcb02ee8be /libs/binder/Parcel.cpp | |
| parent | e209cdde92e60b36652fb078749500f8379c4e6b (diff) | |
| parent | e712783ddc6aaf20c0760adeb2979d8fcce8e80b (diff) | |
Merge "libbinder: restrict non-Android kernel binder use" into main am: 96b83024e4 am: 3969bc7e77 am: e712783ddc
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2860905
Change-Id: I6733149035dabe2e6d7fe47134df7a77fe8d97f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/binder/Parcel.cpp')
| -rw-r--r-- | libs/binder/Parcel.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index 146ddef8ba..028e03dc2e 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -886,6 +886,9 @@ void Parcel::updateWorkSourceRequestHeaderPosition() const { } #ifdef BINDER_WITH_KERNEL_IPC + +#if defined(__ANDROID__) + #if defined(__ANDROID_VNDK__) constexpr int32_t kHeader = B_PACK_CHARS('V', 'N', 'D', 'R'); #elif defined(__ANDROID_RECOVERY__) @@ -893,6 +896,14 @@ constexpr int32_t kHeader = B_PACK_CHARS('R', 'E', 'C', 'O'); #else constexpr int32_t kHeader = B_PACK_CHARS('S', 'Y', 'S', 'T'); #endif + +#else // ANDROID not defined + +// If kernel binder is used in new environments, we need to make sure it's separated +// out and has a separate header. +constexpr int32_t kHeader = B_PACK_CHARS('U', 'N', 'K', 'N'); +#endif + #endif // BINDER_WITH_KERNEL_IPC // Write RPC headers. (previously just the interface token) |