Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e712783d authored by Steven Moreland's avatar Steven Moreland Committed by Automerger Merge Worker
Browse files

Merge "libbinder: restrict non-Android kernel binder use" into main am: 96b83024 am: 3969bc7e 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2860905



Change-Id: If9883de63ba9fcf249ac87edb26fd9cb0ea96ff8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6d1be079 3969bc7e

libs/binder/Parcel.cpp

+11 −0
Original line number Original line Diff line number Diff line
@@ -845,6 +845,9 @@ void Parcel::updateWorkSourceRequestHeaderPosition() const { 
}

}





#ifdef BINDER_WITH_KERNEL_IPC

#ifdef BINDER_WITH_KERNEL_IPC



#if defined(__ANDROID__)



#if defined(__ANDROID_VNDK__)

#if defined(__ANDROID_VNDK__)

constexpr int32_t kHeader = B_PACK_CHARS('V', 'N', 'D', 'R');

constexpr int32_t kHeader = B_PACK_CHARS('V', 'N', 'D', 'R');

#elif defined(__ANDROID_RECOVERY__)

#elif defined(__ANDROID_RECOVERY__)
@@ -852,6 +855,14 @@ constexpr int32_t kHeader = B_PACK_CHARS('R', 'E', 'C', 'O'); 
#else

#else

constexpr int32_t kHeader = B_PACK_CHARS('S', 'Y', 'S', 'T');

constexpr int32_t kHeader = B_PACK_CHARS('S', 'Y', 'S', 'T');

#endif

#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

#endif // BINDER_WITH_KERNEL_IPC





// Write RPC headers.  (previously just the interface token)

// Write RPC headers.  (previously just the interface token)