Skip to content

Make path_open return ELOOP on O_NOFOLLOW|O_DIRECTORY on a symlink. #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sunfishcode merged 1 commit into from
Apr 26, 2019
Merged

Make path_open return ELOOP on O_NOFOLLOW|O_DIRECTORY on a symlink. #118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions wasmtime-wasi/sandboxed-system-primitives/src/posix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1763,21 +1763,32 @@ __wasi_errno_t wasmtime_ssp_path_open(

int nfd = openat(pa.fd, pa.path, noflags, 0666);
if (nfd < 0) {
int openat_errno = errno;
// Linux returns ENXIO instead of EOPNOTSUPP when opening a socket.
if (errno == ENXIO) {
if (openat_errno == ENXIO) {
struct stat sb;
int ret =
fstatat(pa.fd, pa.path, &sb, pa.follow ? 0 : AT_SYMLINK_NOFOLLOW);
path_put(&pa);
return ret == 0 && S_ISSOCK(sb.st_mode) ? __WASI_ENOTSUP
: __WASI_ENXIO;
}
// Linux returns ENOTDIR instead of ELOOP when using O_NOFOLLOW|O_DIRECTORY
// on a symlink.
if (openat_errno == ENOTDIR && (noflags & (O_NOFOLLOW | O_DIRECTORY)) != 0) {
struct stat sb;
int ret = fstatat(pa.fd, pa.path, &sb, AT_SYMLINK_NOFOLLOW);
if (S_ISLNK(sb.st_mode)) {
path_put(&pa);
return __WASI_ELOOP;
}
}
path_put(&pa);
// FreeBSD returns EMLINK instead of ELOOP when using O_NOFOLLOW on
// a symlink.
if (!pa.follow && errno == EMLINK)
if (!pa.follow && openat_errno == EMLINK)
return __WASI_ELOOP;
return convert_errno(errno);
return convert_errno(openat_errno);
}
path_put(&pa);

Expand Down