openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Elliott Hughes 2015-12-16 08:33:52 -08:00
parent 461a29540c
commit 3918090252
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libcutils/ashmem-host.c
View File

@ -43,11 +43,16 @@ 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;
}
close(fd);
return -1;
return fd;
}
int ashmem_set_prot_region(int fd __unused, int prot __unused)