1 files changed, 19 insertions, 0 deletions

diff --git a/include/uapi/linux/android/binder.h b/include/uapi/linux/android/binder.h
index b9ba520f7e4b..2832134e5397 100644
--- a/include/uapi/linux/android/binder.h
+++ b/include/uapi/linux/android/binder.h
@@ -41,6 +41,14 @@ enum {
 enum {
         FLAT_BINDER_FLAG_PRIORITY_MASK = 0xff,
         FLAT_BINDER_FLAG_ACCEPTS_FDS = 0x100,
+
+        /**
+         * @FLAT_BINDER_FLAG_TXN_SECURITY_CTX: request security contexts
+         *
+         * Only when set, causes senders to include their security
+         * context
+         */
+        FLAT_BINDER_FLAG_TXN_SECURITY_CTX = 0x1000,
 };
 
 #ifdef BINDER_IPC_32BIT
@@ -218,6 +226,7 @@ struct binder_node_info_for_ref {
 #define BINDER_VERSION                  _IOWR('b', 9, struct binder_version)
 #define BINDER_GET_NODE_DEBUG_INFO      _IOWR('b', 11, struct binder_node_debug_info)
 #define BINDER_GET_NODE_INFO_FOR_REF    _IOWR('b', 12, struct binder_node_info_for_ref)
+#define BINDER_SET_CONTEXT_MGR_EXT      _IOW('b', 13, struct flat_binder_object)
 
 /*
  * NOTE: Two special error codes you should check for when calling
@@ -276,6 +285,11 @@ struct binder_transaction_data {
         } data;
 };
 
+struct binder_transaction_data_secctx {
+        struct binder_transaction_data transaction_data;
+        binder_uintptr_t secctx;
+};
+
 struct binder_transaction_data_sg {
         struct binder_transaction_data transaction_data;
         binder_size_t buffers_size;
@@ -311,6 +325,11 @@ enum binder_driver_return_protocol {
         BR_OK = _IO('r', 1),
         /* No parameters! */
 
+        BR_TRANSACTION_SEC_CTX = _IOR('r', 2,
+                                      struct binder_transaction_data_secctx),
+        /*
+         * binder_transaction_data_secctx: the received command.
+         */
         BR_TRANSACTION = _IOR('r', 2, struct binder_transaction_data),
         BR_REPLY = _IOR('r', 3, struct binder_transaction_data),
         /*