diff options
| author | ed <ed@FreeBSD.org> | 2015-08-12 11:07:03 +0000 |
|---|---|---|
| committer | ed <ed@FreeBSD.org> | 2015-08-12 11:07:03 +0000 |
| commit | 00042245eb08ab7658c701867779cb0fc9030136 (patch) | |
| tree | 1f6f45b5e9f961fbfb13efe9748358e1c9b5eaf0 /sys/compat | |
| parent | 2dc82f9774d47d886089f594c050b7c14b47dbf2 (diff) | |
| download | FreeBSD-src-00042245eb08ab7658c701867779cb0fc9030136.zip FreeBSD-src-00042245eb08ab7658c701867779cb0fc9030136.tar.gz | |
Use CAP_EVENT instead of CAP_PDWAIT.
The cloudlibc pdwait() function ends up using FreeBSD's kqueue() in
combination with EVFILT_PROCDESC. This depends on CAP_EVENT -- not
CAP_PDWAIT.
Obtained from: https://github.com/NuxiNL/freebsd
Diffstat (limited to 'sys/compat')
| -rw-r--r-- | sys/compat/cloudabi/cloudabi_fd.c | 5 | ||||
| -rw-r--r-- | sys/compat/cloudabi/cloudabi_proc.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/compat/cloudabi/cloudabi_fd.c b/sys/compat/cloudabi/cloudabi_fd.c index 5eab621..24d924f 100644 --- a/sys/compat/cloudabi/cloudabi_fd.c +++ b/sys/compat/cloudabi/cloudabi_fd.c @@ -74,7 +74,7 @@ __FBSDID("$FreeBSD$"); MAPPING(CLOUDABI_RIGHT_MEM_MAP_EXEC, CAP_MMAP_X) \ MAPPING(CLOUDABI_RIGHT_POLL_FD_READWRITE, CAP_EVENT) \ MAPPING(CLOUDABI_RIGHT_POLL_MODIFY, CAP_KQUEUE_CHANGE) \ - MAPPING(CLOUDABI_RIGHT_POLL_PROC_TERMINATE, CAP_PDWAIT) \ + MAPPING(CLOUDABI_RIGHT_POLL_PROC_TERMINATE, CAP_EVENT) \ MAPPING(CLOUDABI_RIGHT_POLL_WAIT, CAP_KQUEUE_EVENT) \ MAPPING(CLOUDABI_RIGHT_PROC_EXEC, CAP_FEXECVE) \ MAPPING(CLOUDABI_RIGHT_SOCK_ACCEPT, CAP_ACCEPT) \ @@ -380,7 +380,8 @@ cloudabi_remove_conflicting_rights(cloudabi_filetype_t filetype, *inheriting = 0; break; case CLOUDABI_FILETYPE_PROCESS: - *base &= ~CLOUDABI_RIGHT_FILE_ADVISE; + *base &= ~(CLOUDABI_RIGHT_FILE_ADVISE | + CLOUDABI_RIGHT_POLL_FD_READWRITE); *inheriting = 0; break; case CLOUDABI_FILETYPE_REGULAR_FILE: diff --git a/sys/compat/cloudabi/cloudabi_proc.c b/sys/compat/cloudabi/cloudabi_proc.c index 22f199d..9c735fa 100644 --- a/sys/compat/cloudabi/cloudabi_proc.c +++ b/sys/compat/cloudabi/cloudabi_proc.c @@ -74,7 +74,7 @@ cloudabi_sys_proc_fork(struct thread *td, struct proc *p2; int error, fd; - cap_rights_init(&fcaps.fc_rights, CAP_FSTAT, CAP_PDWAIT); + cap_rights_init(&fcaps.fc_rights, CAP_FSTAT, CAP_EVENT); error = fork1(td, RFFDG | RFPROC | RFPROCDESC, 0, &p2, &fd, 0, &fcaps); if (error != 0) return (error); |
