diff options
| author | Tapani Pälli <tapani.palli@intel.com> | 2019-08-20 08:59:23 +0300 |
|---|---|---|
| committer | Juan A. Suarez Romero <jasuarez@igalia.com> | 2019-10-02 09:41:27 -0400 |
| commit | 52dc974cd1a892ce8ef1fcc2d4f8e800cc97f562 (patch) | |
| tree | 35916793a00619074e6557fb19acc7db9bf466c0 | |
| parent | 26ab4e161425afee29f6b0c98becd6d529b4220c (diff) | |
| download | mesa-52dc974cd1a892ce8ef1fcc2d4f8e800cc97f562.tar.gz | |
util: fix os_create_anonymous_file on android
Commit fixes current crashes with Vulkan applications on Android.
Fixes: c0376a123418 "util: add anon_file.h for all memfd/temp file usage"
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
(cherry picked from commit ce8fd042a5b0130cc5c62981828b122127711712)
| -rw-r--r-- | src/util/anon_file.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/util/anon_file.c b/src/util/anon_file.c index 2780c74a680..e36800482fc 100644 --- a/src/util/anon_file.c +++ b/src/util/anon_file.c @@ -36,15 +36,16 @@ #ifdef __FreeBSD__ #include <sys/mman.h> -#elif defined(HAVE_MEMFD_CREATE) +#elif defined(HAVE_MEMFD_CREATE) || defined(ANDROID) #include <sys/syscall.h> #include <linux/memfd.h> +#include <stdlib.h> #else #include <stdio.h> #include <stdlib.h> #endif -#if !(defined(__FreeBSD__) || defined(HAVE_MEMFD_CREATE) || defined(HAVE_MKOSTEMP)) +#if !(defined(__FreeBSD__) || defined(HAVE_MEMFD_CREATE) || defined(HAVE_MKOSTEMP) || defined(ANDROID)) static int set_cloexec_or_close(int fd) { @@ -68,7 +69,7 @@ err: } #endif -#if !(defined(__FreeBSD__) || defined(HAVE_MEMFD_CREATE)) +#if !(defined(__FreeBSD__) || defined(HAVE_MEMFD_CREATE) || defined(ANDROID)) static int create_tmpfile_cloexec(char *tmpname) { @@ -118,7 +119,7 @@ os_create_anonymous_file(off_t size, const char *debug_name) #ifdef __FreeBSD__ (void*)debug_name; fd = shm_open(SHM_ANON, O_CREAT | O_RDWR | O_CLOEXEC, 0600); -#elif defined(HAVE_MEMFD_CREATE) +#elif defined(HAVE_MEMFD_CREATE) || defined(ANDROID) if (!debug_name) debug_name = "mesa-shared"; fd = syscall(SYS_memfd_create, debug_name, MFD_CLOEXEC); |