commit c1cea05b5f052474d3df90adbe40f5796d950a6e
author Martijn Coenen <maco@google.com> Wed Dec 05 09:42:25 2018 +0100
committer Martijn Coenen <maco@google.com> Tue Dec 11 11:07:49 2018 +0000
tree ae4a333e8d962c56aa4db9a4adb1fc03138eb585
parent f546acd3fa45878ac9d98589e1f66f5bce90a24a

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
Merged-In: I0eafff70d3a7e4d732fe600a0052efb90108208d

libcutils/include/cutils/native_handle.h

diff --git a/libcutils/include/cutils/native_handle.h b/libcutils/include/cutils/native_handle.h
index 7d6a988..5696edb 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[                            \

libcutils/native_handle.c

diff --git a/libcutils/native_handle.c b/libcutils/native_handle.c
index 9f4840a..2a092dc 100644
--- a/libcutils/native_handle.c
+++ b/libcutils/native_handle.c
@@ -25,9 +25,6 @@
 #include <android/log.h>
 #include <cutils/native_handle.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)) {
@@ -44,7 +41,8 @@
 
 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) {
         return NULL;
     }