1f3bbfd875
The type definitions and constants that were used by COMPAT_CLOUDABI64 are a literal copy of some headers stored inside of CloudABI's C library, cloudlibc. What is annoying is that we can't make use of cloudlibc's system call list, as the format is completely different and doesn't provide enough information. It had to be synced in manually. We recently decided to solve this (and some other problems) by moving the ABI definitions into a separate file: https://github.com/NuxiNL/cloudabi/blob/master/cloudabi.txt This file is processed by a pile of Python scripts to generate the header files like before, documentation (markdown), but in our case more importantly: a FreeBSD system call table. This change discards the old files in sys/contrib/cloudabi and replaces them by the latest copies, which requires some minor changes here and there. Because cloudabi.txt also enforces consistent names of the system call arguments, we have to patch up a small number of system call implementations to use the new argument names. The new header files can also be included directly in FreeBSD kernel space without needing any includes/defines, so we can now remove cloudabi_syscalldefs.h and cloudabi64_syscalldefs.h. Patch up the sources to include the definitions directly from sys/contrib/cloudabi instead.
147 lines
3.9 KiB
C
147 lines
3.9 KiB
C
/*-
|
|
* Copyright (c) 2015 Nuxi, https://nuxi.nl/
|
|
*
|
|
* 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.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``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 OR CONTRIBUTORS 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/kernel.h>
|
|
#include <sys/limits.h>
|
|
#include <sys/malloc.h>
|
|
#include <sys/syscallsubr.h>
|
|
#include <sys/systm.h>
|
|
#include <sys/uio.h>
|
|
|
|
#include <contrib/cloudabi/cloudabi64_types.h>
|
|
|
|
#include <compat/cloudabi64/cloudabi64_proto.h>
|
|
|
|
/* Copies in 64-bit iovec structures from userspace. */
|
|
static int
|
|
cloudabi64_copyinuio(const cloudabi64_iovec_t *iovp, size_t iovcnt,
|
|
struct uio **uiop)
|
|
{
|
|
cloudabi64_iovec_t iovobj;
|
|
struct uio *uio;
|
|
struct iovec *iov;
|
|
size_t i;
|
|
int error;
|
|
|
|
/* Allocate uio and iovecs. */
|
|
if (iovcnt > UIO_MAXIOV)
|
|
return (EINVAL);
|
|
uio = malloc(sizeof(struct uio) + iovcnt * sizeof(struct iovec),
|
|
M_IOV, M_WAITOK);
|
|
iov = (struct iovec *)(uio + 1);
|
|
|
|
/* Initialize uio. */
|
|
uio->uio_iov = iov;
|
|
uio->uio_iovcnt = iovcnt;
|
|
uio->uio_segflg = UIO_USERSPACE;
|
|
uio->uio_offset = -1;
|
|
uio->uio_resid = 0;
|
|
|
|
/* Copy in iovecs. */
|
|
for (i = 0; i < iovcnt; i++) {
|
|
error = copyin(&iovp[i], &iovobj, sizeof(iovobj));
|
|
if (error != 0) {
|
|
free(uio, M_IOV);
|
|
return (error);
|
|
}
|
|
iov[i].iov_base = (void *)iovobj.iov_base;
|
|
iov[i].iov_len = iovobj.iov_len;
|
|
if (iov[i].iov_len > SSIZE_MAX - uio->uio_resid) {
|
|
free(uio, M_IOV);
|
|
return (EINVAL);
|
|
}
|
|
uio->uio_resid += iov[i].iov_len;
|
|
}
|
|
|
|
*uiop = uio;
|
|
return (0);
|
|
}
|
|
|
|
int
|
|
cloudabi64_sys_fd_pread(struct thread *td,
|
|
struct cloudabi64_sys_fd_pread_args *uap)
|
|
{
|
|
struct uio *uio;
|
|
int error;
|
|
|
|
error = cloudabi64_copyinuio(uap->iov, uap->iovcnt, &uio);
|
|
if (error != 0)
|
|
return (error);
|
|
error = kern_preadv(td, uap->fd, uio, uap->offset);
|
|
free(uio, M_IOV);
|
|
return (error);
|
|
}
|
|
|
|
int
|
|
cloudabi64_sys_fd_pwrite(struct thread *td,
|
|
struct cloudabi64_sys_fd_pwrite_args *uap)
|
|
{
|
|
struct uio *uio;
|
|
int error;
|
|
|
|
error = cloudabi64_copyinuio((const cloudabi64_iovec_t *)uap->iov,
|
|
uap->iovcnt, &uio);
|
|
if (error != 0)
|
|
return (error);
|
|
error = kern_pwritev(td, uap->fd, uio, uap->offset);
|
|
free(uio, M_IOV);
|
|
return (error);
|
|
}
|
|
|
|
int
|
|
cloudabi64_sys_fd_read(struct thread *td,
|
|
struct cloudabi64_sys_fd_read_args *uap)
|
|
{
|
|
struct uio *uio;
|
|
int error;
|
|
|
|
error = cloudabi64_copyinuio(uap->iov, uap->iovcnt, &uio);
|
|
if (error != 0)
|
|
return (error);
|
|
error = kern_readv(td, uap->fd, uio);
|
|
free(uio, M_IOV);
|
|
return (error);
|
|
}
|
|
|
|
int
|
|
cloudabi64_sys_fd_write(struct thread *td,
|
|
struct cloudabi64_sys_fd_write_args *uap)
|
|
{
|
|
struct uio *uio;
|
|
int error;
|
|
|
|
error = cloudabi64_copyinuio((const cloudabi64_iovec_t *)uap->iov,
|
|
uap->iovcnt, &uio);
|
|
if (error != 0)
|
|
return (error);
|
|
error = kern_writev(td, uap->fd, uio);
|
|
free(uio, M_IOV);
|
|
return (error);
|
|
}
|