7008be5bd7
in the future in a backward compatible (API and ABI) way. The cap_rights_t represents capability rights. We used to use one bit to represent one right, but we are running out of spare bits. Currently the new structure provides place for 114 rights (so 50 more than the previous cap_rights_t), but it is possible to grow the structure to hold at least 285 rights, although we can make it even larger if 285 rights won't be enough. The structure definition looks like this: struct cap_rights { uint64_t cr_rights[CAP_RIGHTS_VERSION + 2]; }; The initial CAP_RIGHTS_VERSION is 0. The top two bits in the first element of the cr_rights[] array contain total number of elements in the array - 2. This means if those two bits are equal to 0, we have 2 array elements. The top two bits in all remaining array elements should be 0. The next five bits in all array elements contain array index. Only one bit is used and bit position in this five-bits range defines array index. This means there can be at most five array elements in the future. To define new right the CAPRIGHT() macro must be used. The macro takes two arguments - an array index and a bit to set, eg. #define CAP_PDKILL CAPRIGHT(1, 0x0000000000000800ULL) We still support aliases that combine few rights, but the rights have to belong to the same array element, eg: #define CAP_LOOKUP CAPRIGHT(0, 0x0000000000000400ULL) #define CAP_FCHMOD CAPRIGHT(0, 0x0000000000002000ULL) #define CAP_FCHMODAT (CAP_FCHMOD | CAP_LOOKUP) There is new API to manage the new cap_rights_t structure: cap_rights_t *cap_rights_init(cap_rights_t *rights, ...); void cap_rights_set(cap_rights_t *rights, ...); void cap_rights_clear(cap_rights_t *rights, ...); bool cap_rights_is_set(const cap_rights_t *rights, ...); bool cap_rights_is_valid(const cap_rights_t *rights); void cap_rights_merge(cap_rights_t *dst, const cap_rights_t *src); void cap_rights_remove(cap_rights_t *dst, const cap_rights_t *src); bool cap_rights_contains(const cap_rights_t *big, const cap_rights_t *little); Capability rights to the cap_rights_init(), cap_rights_set(), cap_rights_clear() and cap_rights_is_set() functions are provided by separating them with commas, eg: cap_rights_t rights; cap_rights_init(&rights, CAP_READ, CAP_WRITE, CAP_FSTAT); There is no need to terminate the list of rights, as those functions are actually macros that take care of the termination, eg: #define cap_rights_set(rights, ...) \ __cap_rights_set((rights), __VA_ARGS__, 0ULL) void __cap_rights_set(cap_rights_t *rights, ...); Thanks to using one bit as an array index we can assert in those functions that there are no two rights belonging to different array elements provided together. For example this is illegal and will be detected, because CAP_LOOKUP belongs to element 0 and CAP_PDKILL to element 1: cap_rights_init(&rights, CAP_LOOKUP | CAP_PDKILL); Providing several rights that belongs to the same array's element this way is correct, but is not advised. It should only be used for aliases definition. This commit also breaks compatibility with some existing Capsicum system calls, but I see no other way to do that. This should be fine as Capsicum is still experimental and this change is not going to 9.x. Sponsored by: The FreeBSD Foundation
253 lines
6.6 KiB
C
253 lines
6.6 KiB
C
/*-
|
|
* Copyright (c) 1998 Mark Newton
|
|
* Copyright (c) 1994 Christos Zoulas
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*/
|
|
|
|
#include <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/proc.h>
|
|
#include <sys/systm.h>
|
|
#include <sys/capability.h>
|
|
#include <sys/file.h>
|
|
#include <sys/filio.h>
|
|
#include <sys/lock.h>
|
|
#include <sys/signal.h>
|
|
#include <sys/filedesc.h>
|
|
#include <sys/poll.h>
|
|
#include <sys/malloc.h>
|
|
#include <sys/mutex.h>
|
|
|
|
#include <sys/sysproto.h>
|
|
|
|
#include <compat/svr4/svr4.h>
|
|
#include <compat/svr4/svr4_types.h>
|
|
#include <compat/svr4/svr4_util.h>
|
|
#include <compat/svr4/svr4_signal.h>
|
|
#include <compat/svr4/svr4_proto.h>
|
|
#include <compat/svr4/svr4_ioctl.h>
|
|
#include <compat/svr4/svr4_filio.h>
|
|
|
|
/*#define GROTTY_READ_HACK*/
|
|
|
|
int
|
|
svr4_sys_poll(td, uap)
|
|
struct thread *td;
|
|
struct svr4_sys_poll_args *uap;
|
|
{
|
|
int error;
|
|
struct poll_args pa;
|
|
struct pollfd *pfd;
|
|
int idx = 0, cerr;
|
|
u_long siz;
|
|
|
|
if (uap->nfds > maxfilesperproc && uap->nfds > FD_SETSIZE)
|
|
return (EINVAL);
|
|
|
|
pa.fds = uap->fds;
|
|
pa.nfds = uap->nfds;
|
|
pa.timeout = uap->timeout;
|
|
|
|
siz = uap->nfds * sizeof(struct pollfd);
|
|
pfd = (struct pollfd *)malloc(siz, M_TEMP, M_WAITOK);
|
|
|
|
error = sys_poll(td, (struct poll_args *)uap);
|
|
|
|
if ((cerr = copyin(uap->fds, pfd, siz)) != 0) {
|
|
error = cerr;
|
|
goto done;
|
|
}
|
|
|
|
for (idx = 0; idx < uap->nfds; idx++) {
|
|
/* POLLWRNORM already equals POLLOUT, so we don't worry about that */
|
|
if (pfd[idx].revents & (POLLOUT | POLLWRNORM | POLLWRBAND))
|
|
pfd[idx].revents |= (POLLOUT | POLLWRNORM | POLLWRBAND);
|
|
}
|
|
if ((cerr = copyout(pfd, uap->fds, siz)) != 0) {
|
|
error = cerr;
|
|
goto done; /* yeah, I know it's the next line, but this way I won't
|
|
forget to update it if I add more code */
|
|
}
|
|
done:
|
|
free(pfd, M_TEMP);
|
|
return error;
|
|
}
|
|
|
|
#if defined(READ_TEST)
|
|
int
|
|
svr4_sys_read(td, uap)
|
|
struct thread *td;
|
|
struct svr4_sys_read_args *uap;
|
|
{
|
|
struct read_args ra;
|
|
cap_rights_t rights;
|
|
struct file *fp;
|
|
struct socket *so = NULL;
|
|
int so_state;
|
|
sigset_t sigmask;
|
|
int rv;
|
|
|
|
ra.fd = uap->fd;
|
|
ra.buf = uap->buf;
|
|
ra.nbyte = uap->nbyte;
|
|
|
|
if (fget(td, uap->fd, cap_rights_init(&rights, CAP_READ), &fp) != 0) {
|
|
DPRINTF(("Something fishy with the user-supplied file descriptor...\n"));
|
|
return EBADF;
|
|
}
|
|
|
|
if (fp->f_type == DTYPE_SOCKET) {
|
|
so = fp->f_data;
|
|
DPRINTF(("fd %d is a socket\n", uap->fd));
|
|
if (so->so_state & SS_ASYNC) {
|
|
DPRINTF(("fd %d is an ASYNC socket!\n", uap->fd));
|
|
}
|
|
DPRINTF(("Here are its flags: 0x%x\n", so->so_state));
|
|
#if defined(GROTTY_READ_HACK)
|
|
so_state = so->so_state;
|
|
so->so_state &= ~SS_NBIO;
|
|
#endif
|
|
}
|
|
|
|
rv = read(td, &ra);
|
|
|
|
DPRINTF(("svr4_read(%d, 0x%0x, %d) = %d\n",
|
|
uap->fd, uap->buf, uap->nbyte, rv));
|
|
if (rv == EAGAIN) {
|
|
#ifdef DEBUG_SVR4
|
|
struct sigacts *ps;
|
|
|
|
PROC_LOCK(td->td_proc);
|
|
ps = td->td_proc->p_sigacts;
|
|
mtx_lock(&ps->ps_mtx);
|
|
#endif
|
|
DPRINTF(("sigmask = 0x%x\n", td->td_sigmask));
|
|
DPRINTF(("sigignore = 0x%x\n", ps->ps_sigignore));
|
|
DPRINTF(("sigcaught = 0x%x\n", ps->ps_sigcatch));
|
|
DPRINTF(("siglist = 0x%x\n", td->td_siglist));
|
|
#ifdef DEBUG_SVR4
|
|
mtx_unlock(&ps->ps_mtx);
|
|
PROC_UNLOCK(td->td_proc);
|
|
#endif
|
|
}
|
|
|
|
#if defined(GROTTY_READ_HACK)
|
|
if (so) { /* We've already checked to see if this is a socket */
|
|
so->so_state = so_state;
|
|
}
|
|
#endif
|
|
fdrop(fp, td);
|
|
|
|
return(rv);
|
|
}
|
|
#endif /* READ_TEST */
|
|
|
|
#if defined(BOGUS)
|
|
int
|
|
svr4_sys_write(td, uap)
|
|
struct thread *td;
|
|
struct svr4_sys_write_args *uap;
|
|
{
|
|
struct write_args wa;
|
|
struct file *fp;
|
|
int rv;
|
|
|
|
wa.fd = uap->fd;
|
|
wa.buf = uap->buf;
|
|
wa.nbyte = uap->nbyte;
|
|
|
|
rv = write(td, &wa);
|
|
|
|
DPRINTF(("svr4_write(%d, 0x%0x, %d) = %d\n",
|
|
uap->fd, uap->buf, uap->nbyte, rv));
|
|
|
|
return(rv);
|
|
}
|
|
#endif /* BOGUS */
|
|
|
|
int
|
|
svr4_fil_ioctl(fp, td, retval, fd, cmd, data)
|
|
struct file *fp;
|
|
struct thread *td;
|
|
register_t *retval;
|
|
int fd;
|
|
u_long cmd;
|
|
caddr_t data;
|
|
{
|
|
struct filedesc *fdp = td->td_proc->p_fd;
|
|
struct filedescent *fde;
|
|
int error, num;
|
|
|
|
*retval = 0;
|
|
|
|
switch (cmd) {
|
|
case SVR4_FIOCLEX:
|
|
FILEDESC_XLOCK(fdp);
|
|
fde = &fdp->fd_ofiles[fd];
|
|
fde->fde_flags |= UF_EXCLOSE;
|
|
FILEDESC_XUNLOCK(fdp);
|
|
return 0;
|
|
|
|
case SVR4_FIONCLEX:
|
|
FILEDESC_XLOCK(fdp);
|
|
fde = &fdp->fd_ofiles[fd];
|
|
fde->fde_flags &= ~UF_EXCLOSE;
|
|
FILEDESC_XUNLOCK(fdp);
|
|
return 0;
|
|
|
|
case SVR4_FIOGETOWN:
|
|
case SVR4_FIOSETOWN:
|
|
case SVR4_FIOASYNC:
|
|
case SVR4_FIONBIO:
|
|
case SVR4_FIONREAD:
|
|
if ((error = copyin(data, &num, sizeof(num))) != 0)
|
|
return error;
|
|
|
|
switch (cmd) {
|
|
case SVR4_FIOGETOWN: cmd = FIOGETOWN; break;
|
|
case SVR4_FIOSETOWN: cmd = FIOSETOWN; break;
|
|
case SVR4_FIOASYNC: cmd = FIOASYNC; break;
|
|
case SVR4_FIONBIO: cmd = FIONBIO; break;
|
|
case SVR4_FIONREAD: cmd = FIONREAD; break;
|
|
}
|
|
|
|
#ifdef SVR4_DEBUG
|
|
if (cmd == FIOASYNC) DPRINTF(("FIOASYNC\n"));
|
|
#endif
|
|
error = fo_ioctl(fp, cmd, (caddr_t) &num, td->td_ucred, td);
|
|
|
|
if (error)
|
|
return error;
|
|
|
|
return copyout(&num, data, sizeof(num));
|
|
|
|
default:
|
|
DPRINTF(("Unknown svr4 filio %lx\n", cmd));
|
|
return 0; /* ENOSYS really */
|
|
}
|
|
}
|