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

Commit 39180902 authored by Elliott Hughes's avatar Elliott Hughes
Browse files

Make host ashmem_create_region more robust. 

Don't clobber errno if mkstemp failed, always unlink, and only count
mkstemp/ftruncate failures as real failures --- if only the unlink
fails, there's no point not using what we have.

Change-Id: I6bc788682c88651a50a6316b9ca07ba07e9fefa2
parent 461a2954

libcutils/ashmem-host.c

+9 −4
Original line number Diff line number Diff line
@@ -43,13 +43,18 @@ int ashmem_create_region(const char *ignored __unused, size_t size) 
    char template[PATH_MAX];

    snprintf(template, sizeof(template), "/tmp/android-ashmem-%d-XXXXXXXXX", getpid());

    int fd = mkstemp(template);

    if (fd != -1 && TEMP_FAILURE_RETRY(ftruncate(fd, size)) != -1 && unlink(template) != -1) {

        return fd;

    }

    if (fd == -1) return -1;



    unlink(template);



    if (TEMP_FAILURE_RETRY(ftruncate(fd, size)) == -1) {

      close(fd);

      return -1;

    }



    return fd;

}



int ashmem_set_prot_region(int fd __unused, int prot __unused)

{

    return 0;