diff options
| author | Christopher Ferris <cferris@google.com> | 2019-03-20 15:31:54 -0700 |
|---|---|---|
| committer | Christopher Ferris <cferris@google.com> | 2019-03-20 17:14:57 -0700 |
| commit | 9695513c34359ed3a878a07ab042232b5d9e1bd1 (patch) | |
| tree | b90f01bdb8e8183cd40425b4012e4dfb1e3b0fc4 | |
| parent | 1160cf2cf571dfd614ebbe9523d2138157a80ef4 (diff) | |
| download | kernel-headers-9695513c34359ed3a878a07ab042232b5d9e1bd1.tar.gz | |
Update to kernel headers v5.0.3.
Test: NA
Change-Id: Ib476493ba17813f827418ee5978c1c1486a81ec3
| -rw-r--r-- | original/uapi/linux/android/binder.h | 19 | ||||
| -rw-r--r-- | original/uapi/linux/version.h | 2 |
2 files changed, 20 insertions, 1 deletions
diff --git a/original/uapi/linux/android/binder.h b/original/uapi/linux/android/binder.h index b9ba520..2832134 100644 --- a/original/uapi/linux/android/binder.h +++ b/original/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), /* diff --git a/original/uapi/linux/version.h b/original/uapi/linux/version.h index 1603a44..1d3a407 100644 --- a/original/uapi/linux/version.h +++ b/original/uapi/linux/version.h @@ -1,2 +1,2 @@ -#define LINUX_VERSION_CODE 327680 +#define LINUX_VERSION_CODE 327683 #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c)) |