8451d0dd78
patch modifies makesyscalls.sh to prefix all of the non-compatibility calls (e.g. not linux_, freebsd32_) with sys_ and updates the kernel entry points and all places in the code that use them. It also fixes an additional name space collision between the kernel function psignal and the libc function of the same name by renaming the kernel psignal kern_psignal(). By introducing this change now we will ease future MFCs that change syscalls. Reviewed by: rwatson Approved by: re (bz)
250 lines
6.5 KiB
C
250 lines
6.5 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;
|
|
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_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;
|
|
{
|
|
int error;
|
|
int num;
|
|
struct filedesc *fdp = td->td_proc->p_fd;
|
|
|
|
*retval = 0;
|
|
|
|
switch (cmd) {
|
|
case SVR4_FIOCLEX:
|
|
FILEDESC_XLOCK(fdp);
|
|
fdp->fd_ofileflags[fd] |= UF_EXCLOSE;
|
|
FILEDESC_XUNLOCK(fdp);
|
|
return 0;
|
|
|
|
case SVR4_FIONCLEX:
|
|
FILEDESC_XLOCK(fdp);
|
|
fdp->fd_ofileflags[fd] &= ~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 */
|
|
}
|
|
}
|