proxmox-mirrors/wasi-libc
1
0
Fork 0
mirror of https://git.proxmox.com/git/wasi-libc synced 2025-07-09 14:26:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't pre-check capabilities in openat. (#130)

Browse Source 
Rely on the WASI implementation to check capabilities flags, rather
than also checking them in the userspace `openat` implementation.

This code is admittedly getting fairly dense with `#ifdef`s, so it
may soon make sense to move this file out of the `cloudlibc`
directory and removing the upstream change markers.
This commit is contained in:
Dan Gohman 2019-11-10 06:39:00 -08:00 committed by GitHub
parent ca9046d872
commit deb8eae418
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libc-bottom-half/cloudlibc/src/libc/fcntl/openat.c
View File

@ -33,7 +33,9 @@ int __wasilibc_openat_nomode(int fd, const char *path, int oflag) {
// Compute rights corresponding with the access modes provided. // Compute rights corresponding with the access modes provided.
// Attempt to obtain all rights, except the ones that contradict the // Attempt to obtain all rights, except the ones that contradict the
// access mode provided to openat(). // access mode provided to openat().
#ifdef __wasilibc_unmodified_upstream // Let the WASI implementation check this instead.
__wasi_rights_t min = 0; __wasi_rights_t min = 0;
#endif
__wasi_rights_t max = __wasi_rights_t max =
~(__WASI_RIGHT_FD_DATASYNC | __WASI_RIGHT_FD_READ | ~(__WASI_RIGHT_FD_DATASYNC | __WASI_RIGHT_FD_READ |
#ifdef __wasilibc_unmodified_upstream // fstat #ifdef __wasilibc_unmodified_upstream // fstat
@ -53,21 +55,23 @@ int __wasilibc_openat_nomode(int fd, const char *path, int oflag) {
case O_RDWR: case O_RDWR:
case O_WRONLY: case O_WRONLY:
if ((oflag & O_RDONLY) != 0) { if ((oflag & O_RDONLY) != 0) {
#ifdef __wasilibc_unmodified_upstream // RIGHT_MEM_MAP_EXEC #ifdef __wasilibc_unmodified_upstream // Let the WASI implementation check this instead.
min |= (oflag & O_DIRECTORY) == 0 ? __WASI_RIGHT_FD_READ min |= (oflag & O_DIRECTORY) == 0 ? __WASI_RIGHT_FD_READ
: __WASI_RIGHT_FILE_READDIR; : __WASI_RIGHT_FILE_READDIR;
#endif
#ifdef __wasilibc_unmodified_upstream // RIGHT_MEM_MAP_EXEC
max |= __WASI_RIGHT_FD_READ | __WASI_RIGHT_FILE_READDIR | max |= __WASI_RIGHT_FD_READ | __WASI_RIGHT_FILE_READDIR |
__WASI_RIGHT_MEM_MAP_EXEC; __WASI_RIGHT_MEM_MAP_EXEC;
#else #else
min |= (oflag & O_DIRECTORY) == 0 ? __WASI_RIGHT_FD_READ
: __WASI_RIGHT_FD_READDIR;
max |= __WASI_RIGHT_FD_READ | __WASI_RIGHT_FD_READDIR; max |= __WASI_RIGHT_FD_READ | __WASI_RIGHT_FD_READDIR;
#endif #endif
} }
if ((oflag & O_WRONLY) != 0) { if ((oflag & O_WRONLY) != 0) {
#ifdef __wasilibc_unmodified_upstream // Let the WASI implementation check this instead.
min |= __WASI_RIGHT_FD_WRITE; min |= __WASI_RIGHT_FD_WRITE;
if ((oflag & O_APPEND) == 0) if ((oflag & O_APPEND) == 0)
min |= __WASI_RIGHT_FD_SEEK; min |= __WASI_RIGHT_FD_SEEK;
#endif
max |= __WASI_RIGHT_FD_DATASYNC | __WASI_RIGHT_FD_WRITE | max |= __WASI_RIGHT_FD_DATASYNC | __WASI_RIGHT_FD_WRITE |
#ifdef __wasilibc_unmodified_upstream // fstat #ifdef __wasilibc_unmodified_upstream // fstat
__WASI_RIGHT_FILE_ALLOCATE | __WASI_RIGHT_FILE_ALLOCATE |
@ -89,8 +93,10 @@ int __wasilibc_openat_nomode(int fd, const char *path, int oflag) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
#ifdef __wasilibc_unmodified_upstream // Let the WASI implementation check this instead.
assert((min & max) == min && assert((min & max) == min &&
"Minimal rights should be a subset of the maximum"); "Minimal rights should be a subset of the maximum");
#endif
// Ensure that we can actually obtain the minimal rights needed. // Ensure that we can actually obtain the minimal rights needed.
__wasi_fdstat_t fsb_cur; __wasi_fdstat_t fsb_cur;
@ -103,6 +109,7 @@ int __wasilibc_openat_nomode(int fd, const char *path, int oflag) {
errno = error; errno = error;
return -1; return -1;
} }
#ifdef __wasilibc_unmodified_upstream // Let the WASI implementation check this instead.
if (fsb_cur.fs_filetype != __WASI_FILETYPE_DIRECTORY) { if (fsb_cur.fs_filetype != __WASI_FILETYPE_DIRECTORY) {
errno = ENOTDIR; errno = ENOTDIR;
return -1; return -1;
@ -111,6 +118,7 @@ int __wasilibc_openat_nomode(int fd, const char *path, int oflag) {
errno = ENOTCAPABLE; errno = ENOTCAPABLE;
return -1; return -1;
} }
#endif
// Path lookup properties. // Path lookup properties.
#ifdef __wasilibc_unmodified_upstream // split out __wasi_lookup_t #ifdef __wasilibc_unmodified_upstream // split out __wasi_lookup_t