Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87b02f23 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

am 4e830641: am 1def25a2: Merge commit \'7ac60686\' into manualmerge

* commit '4e830641':
  Prevent integer overflow when allocating native_handle_t
parents 2557cd21 4e830641
Loading
Loading
Loading
Loading
+8 −2
Original line number Diff line number Diff line
@@ -25,11 +25,17 @@
#include <cutils/log.h>
#include <cutils/native_handle.h>

static const int kMaxNativeFds = 1024;
static const int kMaxNativeInts = 1024;

native_handle_t* native_handle_create(int numFds, int numInts)
{
    native_handle_t* h = malloc(
            sizeof(native_handle_t) + sizeof(int)*(numFds+numInts));
    if (numFds < 0 || numInts < 0 || numFds > kMaxNativeFds || numInts > kMaxNativeInts) {
        return NULL;
    }

    size_t mallocSize = sizeof(native_handle_t) + (sizeof(int) * (numFds + numInts));
    native_handle_t* h = malloc(mallocSize);
    if (h) {
        h->version = sizeof(native_handle_t);
        h->numFds = numFds;