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

Commit 48ac3d1b authored by Elliott Hughes's avatar Elliott Hughes Committed by Gerrit Code Review
Browse files

Merge "Judge mmap failed by MAP_FAILED instead of NULL"

parents cd3897d0 473a7299

fastbootd/transport.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ int transport_handle_download(struct transport_handle *thandle, size_t len) 
    ftruncate(fd, len);



    buffer = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);

    if (buffer == NULL) {

    if (buffer == MAP_FAILED) {

        D(ERR, "mmap(%zu) failed: %d %s", len, errno, strerror(errno));

        goto err;

    }

libpixelflinger/codeflinger/CodeCache.cpp

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static mspace getMspace() 
        gExecutableStore = mmap(NULL, kMaxCodeCacheCapacity,

                                PROT_READ | PROT_WRITE | PROT_EXEC,

                                MAP_PRIVATE, fd, 0);

        LOG_ALWAYS_FATAL_IF(gExecutableStore == NULL,

        LOG_ALWAYS_FATAL_IF(gExecutableStore == MAP_FAILED,

                            "Creating code cache, mmap failed with error "

                            "'%s'", strerror(errno));

        close(fd);