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

Commit d6308379 authored by Michael Lentine's avatar Michael Lentine Committed by Android Git Automerger
Browse files

am 76ebd319: am 3d89edca: am e6f7a44e: Fix for corruption when numFds or numInts is too large.

* commit '76ebd319':
  Fix for corruption when numFds or numInts is too large.
parents 3c648e37 76ebd319
Loading
Loading
Loading
Loading
+16 −1
Original line number Diff line number Diff line
@@ -251,10 +251,19 @@ status_t GraphicBuffer::unflatten(
    const size_t numFds  = buf[6];
    const size_t numInts = buf[7];

    const size_t maxNumber = UINT_MAX / sizeof(int);
    if (numFds >= maxNumber || numInts >= (maxNumber - 10)) {
        width = height = stride = format = usage = 0;
        handle = NULL;
        ALOGE("unflatten: numFds or numInts is too large: %d, %d",
                numFds, numInts);
        return BAD_VALUE;
    }

    const size_t sizeNeeded = (8 + numInts) * sizeof(int);
    if (size < sizeNeeded) return NO_MEMORY;

    size_t fdCountNeeded = 0;
    size_t fdCountNeeded = numFds;
    if (count < fdCountNeeded) return NO_MEMORY;

    if (handle) {
@@ -269,6 +278,12 @@ status_t GraphicBuffer::unflatten(
        format = buf[4];
        usage  = buf[5];
        native_handle* h = native_handle_create(numFds, numInts);
        if (!h) {
            width = height = stride = format = usage = 0;
            handle = NULL;
            ALOGE("unflatten: native_handle_create failed");
            return NO_MEMORY;
        }
        memcpy(h->data,          fds,     numFds*sizeof(int));
        memcpy(h->data + numFds, &buf[8], numInts*sizeof(int));
        handle = h;