diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-05-12 17:35:48 -0700 |
|---|---|---|
| committer | The Android Automerger <android-build@google.com> | 2015-08-13 19:41:48 -0700 |
| commit | 7dcd0ec9c91688cfa3f679804ba6e132f9811254 (patch) | |
| tree | b34e58be4744601456d6adebe655f92339e85260 | |
| parent | 796aaf7fb160fea12bddc8406d7f006ce811eb43 (diff) | |
| download | frameworks_native-7dcd0ec9c91688cfa3f679804ba6e132f9811254.zip frameworks_native-7dcd0ec9c91688cfa3f679804ba6e132f9811254.tar.gz frameworks_native-7dcd0ec9c91688cfa3f679804ba6e132f9811254.tar.bz2 | |
Verify that the native handle was created
The inputs to native_handle_create can cause an overflowed allocation,
so check the return value of native_handle_create before accessing
the memory it returns.
Bug:19334482
Change-Id: I1f489382776c2a1390793a79dc27ea17baa9b2a2
(cherry picked from commit eaac99a7172da52a76ba48c26413778a74951b1a)
| -rw-r--r-- | libs/binder/Parcel.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index e7589b1..99c934c 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -1215,6 +1215,10 @@ native_handle* Parcel::readNativeHandle() const if (err != NO_ERROR) return 0; native_handle* h = native_handle_create(numFds, numInts); + if (!h) { + return 0; + } + for (int i=0 ; err==NO_ERROR && i<numFds ; i++) { h->data[i] = dup(readFileDescriptor()); if (h->data[i] < 0) err = BAD_VALUE; |