summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartijn Coenen <maco@google.com>2018-12-05 09:42:25 +0100
committerMartijn Coenen <maco@google.com>2018-12-11 11:38:41 +0100
commit02debfa2df1589c2f8e35cc2db93dd131f43f2db (patch)
tree4125b0ed7edaf60f3231311bd70706cb839e15ee
parent9ce034ce8a6709625e2ac5a6cdbff355bbce8796 (diff)
downloadcore-02debfa2df1589c2f8e35cc2db93dd131f43f2db.tar.gz
core-02debfa2df1589c2f8e35cc2db93dd131f43f2db.tar.bz2
core-02debfa2df1589c2f8e35cc2db93dd131f43f2db.zip
Export maximum number of fds/ints in a native_handle.
So we can deserialize it consisently and safely. Bug: 120084106 Test: builds Change-Id: I0eafff70d3a7e4d732fe600a0052efb90108208d
-rw-r--r--libcutils/include/cutils/native_handle.h3
-rw-r--r--libcutils/native_handle.c6
2 files changed, 5 insertions, 4 deletions
diff --git a/libcutils/include/cutils/native_handle.h b/libcutils/include/cutils/native_handle.h
index abe6dd614..c1c27f753 100644
--- a/libcutils/include/cutils/native_handle.h
+++ b/libcutils/include/cutils/native_handle.h
@@ -23,6 +23,9 @@
extern "C" {
#endif
+#define NATIVE_HANDLE_MAX_FDS 1024
+#define NATIVE_HANDLE_MAX_INTS 1024
+
/* Declare a char array for use with native_handle_init */
#define NATIVE_HANDLE_DECLARE_STORAGE(name, maxFds, maxInts) \
alignas(native_handle_t) char name[ \
diff --git a/libcutils/native_handle.c b/libcutils/native_handle.c
index 95bbc41c4..5cc1a9e6b 100644
--- a/libcutils/native_handle.c
+++ b/libcutils/native_handle.c
@@ -22,9 +22,6 @@
#include <string.h>
#include <unistd.h>
-static const int kMaxNativeFds = 1024;
-static const int kMaxNativeInts = 1024;
-
native_handle_t* native_handle_init(char* storage, int numFds, int numInts) {
if ((uintptr_t) storage % alignof(native_handle_t)) {
errno = EINVAL;
@@ -39,7 +36,8 @@ native_handle_t* native_handle_init(char* storage, int numFds, int numInts) {
}
native_handle_t* native_handle_create(int numFds, int numInts) {
- if (numFds < 0 || numInts < 0 || numFds > kMaxNativeFds || numInts > kMaxNativeInts) {
+ if (numFds < 0 || numInts < 0 || numFds > NATIVE_HANDLE_MAX_FDS ||
+ numInts > NATIVE_HANDLE_MAX_INTS) {
errno = EINVAL;
return NULL;
}