commit 29d8cf91bed3c9f72a97046655bc3bdc05952d3a
author Riley Andrews <riandrews@google.com> Mon Jan 12 18:16:29 2015 -0800
committer Riley Andrews <riandrews@google.com> Tue Jan 13 21:59:44 2015 +0000
tree ad83668cfd1b74ec25ea6111876e8d85190ce05a
parent 50bcb00a9112b70183f7826675d8455cfd978e6a

Replace all instances of intptr_t with uintptr_t.

When compiling 32 bit binaries against a 64 bit binder interface,
implicit promotions of intptr_t types to uint64_t for fields in the
binder ioctl structures can result in invalid pointers because of sign
extension.

libs/binder/tests/binderDriverInterfaceTest.cpp

diff --git a/libs/binder/tests/binderDriverInterfaceTest.cpp b/libs/binder/tests/binderDriverInterfaceTest.cpp
index 64a6c91..315f349 100644
--- a/libs/binder/tests/binderDriverInterfaceTest.cpp
+++ b/libs/binder/tests/binderDriverInterfaceTest.cpp
@@ -58,7 +58,7 @@
                 BC_ENTER_LOOPER,
             };
             struct binder_write_read bwr = binder_write_read();
-            bwr.write_buffer = (intptr_t)bc;
+            bwr.write_buffer = (uintptr_t)bc;
             bwr.write_size = sizeof(bc);
             ret = ioctl(m_binderFd, BINDER_WRITE_READ, &bwr);
             EXPECT_EQ(0, ret);
@@ -111,7 +111,7 @@
             uint32_t br[32];
             struct binder_write_read bwr = binder_write_read();
             SCOPED_TRACE("TestReadEmpty");
-            bwr.read_buffer = (intptr_t)br;
+            bwr.read_buffer = (uintptr_t)br;
             bwr.read_size = sizeof(br);
             binderTestIoctlErr1(BINDER_WRITE_READ, &bwr, EAGAIN);
             EXPECT_EQ(0u, bwr.read_consumed);
@@ -206,7 +206,7 @@
         0,
     };
     struct binder_write_read bwr = binder_write_read();
-    bwr.write_buffer = (intptr_t)bc;
+    bwr.write_buffer = (uintptr_t)bc;
     bwr.write_size = sizeof(bc);
     binderTestIoctl(BINDER_WRITE_READ, &bwr);
     EXPECT_EQ(sizeof(bc), bwr.write_consumed);
@@ -241,9 +241,9 @@
     } __attribute__((packed)) br;
     struct binder_write_read bwr = binder_write_read();
 
-    bwr.write_buffer = (intptr_t)&bc1;
+    bwr.write_buffer = (uintptr_t)&bc1;
     bwr.write_size = sizeof(bc1);
-    bwr.read_buffer = (intptr_t)&br;
+    bwr.read_buffer = (uintptr_t)&br;
     bwr.read_size = sizeof(br);
 
     {
@@ -283,7 +283,7 @@
             .arg1 = br.arg2.data.ptr.buffer,
         };
 
-        bwr.write_buffer = (intptr_t)&bc2;
+        bwr.write_buffer = (uintptr_t)&bc2;
         bwr.write_size = sizeof(bc2);
         bwr.write_consumed = 0;
         bwr.read_size = 0;
@@ -329,9 +329,9 @@
     } __attribute__((packed)) br;
     struct binder_write_read bwr = binder_write_read();
 
-    bwr.write_buffer = (intptr_t)&bc;
+    bwr.write_buffer = (uintptr_t)&bc;
     bwr.write_size = sizeof(bc);
-    bwr.read_buffer = (intptr_t)&br;
+    bwr.read_buffer = (uintptr_t)&br;
     bwr.read_size = sizeof(br);
 
     binderTestIoctl(BINDER_WRITE_READ, &bwr);