qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: Warner Losh <imp@bsdimp.com>, qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	arrowd@FreeBSD.org, Kyle Evans <kevans@freebsd.org>,
	def@FreeBSD.org, jrtc27@FreeBSD.org,
	Brad Smith <brad@comstyle.com>
Subject: Re: [PATCH 14/22] bsd-user/freebsd/os-syscall.c: lock_iovec
Date: Wed, 2 Feb 2022 08:16:47 +1100	[thread overview]
Message-ID: <3f3af9ba-513e-6f69-7010-9eafd0720180@linaro.org> (raw)
In-Reply-To: <20220201111455.52511-15-imp@bsdimp.com>

On 2/1/22 22:14, Warner Losh wrote:
> lock_iovec will lock an I/O vec and the memory to which it referrs and
> create a iovec in the host space that referrs to it, with full error
> unwinding.
> 
> Signed-off-by: Warner Losh <imp@bsdimp.com>
> ---
>   bsd-user/freebsd/os-syscall.c | 92 +++++++++++++++++++++++++++++++++++
>   1 file changed, 92 insertions(+)
> 
> diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
> index 060134a9ecd..c21759ae7ce 100644
> --- a/bsd-user/freebsd/os-syscall.c
> +++ b/bsd-user/freebsd/os-syscall.c
> @@ -75,6 +75,98 @@ bool is_error(abi_long ret)
>       return (abi_ulong)ret >= (abi_ulong)(-4096);
>   }
>   
> +struct iovec *lock_iovec(int type, abi_ulong target_addr,
> +        int count, int copy)
> +{
> +    struct target_iovec *target_vec;
> +    struct iovec *vec;
> +    abi_ulong total_len, max_len;
> +    int i;
> +    int err = 0;
> +    bool bad_address = false;
> +
> +    if (count == 0) {
> +        errno = 0;
> +        return NULL;
> +    }
> +    if (count < 0 || count > IOV_MAX) {
> +        errno = EINVAL;
> +        return NULL;
> +    }
> +
> +    vec = calloc(count, sizeof(struct iovec));

g_try_new0.

You may want to use g_autofree to simplify error handling, which then requires you use

     return g_steal_pointer(&vec);

on the success path.

> +    if (vec == NULL) {
> +        errno = ENOMEM;
> +        return NULL;
> +    }
> +
> +    target_vec = lock_user(VERIFY_READ, target_addr,
> +                           count * sizeof(struct target_iovec), 1);
> +    if (target_vec == NULL) {
> +        err = EFAULT;
> +        goto fail2;
> +    }
> +
> +    /*
> +     * ??? If host page size > target page size, this will result in a value
> +     * larger than what we can actually support.
> +     */
> +    max_len = 0x7fffffff & TARGET_PAGE_MASK;
> +    total_len = 0;
> +
> +    for (i = 0; i < count; i++) {
> +        abi_ulong base = tswapal(target_vec[i].iov_base);
> +        abi_long len = tswapal(target_vec[i].iov_len);
> +
> +        if (len < 0) {
> +            err = EINVAL;
> +            goto fail;
> +        } else if (len == 0) {
> +            /* Zero length pointer is ignored.  */
> +            vec[i].iov_base = 0;
> +        } else {
> +            vec[i].iov_base = lock_user(type, base, len, copy);
> +            /*
> +             * If the first buffer pointer is bad, this is a fault.  But
> +             * subsequent bad buffers will result in a partial write; this is
> +             * realized by filling the vector with null pointers and zero
> +             * lengths.
> +             */
> +            if (!vec[i].iov_base) {
> +                if (i == 0) {
> +                    err = EFAULT;
> +                    goto fail;
> +                } else {
> +                    bad_address = true;
> +                }
> +            }
> +            if (bad_address) {
> +                len = 0;
> +            }

Surely this bad_address check should happen earlier, before we attempt the lock above?
E.g.

     else if (len == 0 || bad_address)


r~


  parent reply	other threads:[~2022-02-02  2:43 UTC|newest]

Thread overview: 67+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-01 11:14 [PATCH 00/22] bsd-user: Start upstreaming the system calls Warner Losh
2022-02-01 11:14 ` [PATCH 01/22] bsd-user/main.c: Drop syscall flavor arg -bsd Warner Losh
2022-02-01 15:54   ` Richard Henderson
2022-02-01 11:14 ` [PATCH 02/22] bsd-user/x86_64/target_arch_cpu.h: int $80 never was a BSD system call on amd64 Warner Losh
2022-02-01 15:57   ` Richard Henderson
2022-02-01 16:19   ` Kyle Evans
2022-02-01 11:14 ` [PATCH 03/22] bsd-user/x86_64/target_arch_cpu.h: Remove openbsd syscall Warner Losh
2022-02-01 16:22   ` Kyle Evans
2022-02-01 23:13     ` Warner Losh
2022-02-01 17:27   ` Richard Henderson
2022-02-01 11:14 ` [PATCH 04/22] bsd-user/i386/target_arch_cpu.h: " Warner Losh
2022-02-01 16:24   ` Kyle Evans
2022-02-01 17:29   ` Richard Henderson
2022-02-01 11:14 ` [PATCH 05/22] bsd-user/arm/target_arch_cpu.h: Only support FreeBSD sys calls Warner Losh
2022-02-01 16:32   ` Kyle Evans
2022-02-01 23:19     ` Warner Losh
2022-02-01 17:31   ` Richard Henderson
2022-02-01 11:14 ` [PATCH 06/22] bsd-user/arm/target_arch_thread.h: Assume a FreeBSD target Warner Losh
2022-02-01 16:33   ` Kyle Evans
2022-02-01 17:34   ` Richard Henderson
2022-02-01 11:14 ` [PATCH 07/22] bsd-user/x86_64/target_arch_thread.h: " Warner Losh
2022-02-01 16:36   ` Kyle Evans
2022-02-01 17:34   ` Richard Henderson
2022-02-01 11:14 ` [PATCH 08/22] bsd-user: Remove bsd_type Warner Losh
2022-02-01 16:34   ` Kyle Evans
2022-02-01 17:35   ` Richard Henderson
2022-02-01 11:14 ` [PATCH 09/22] bsd-user/freebsd/os-syscall.c: Move syscall processing here Warner Losh
2022-02-01 16:18   ` Kyle Evans
2022-02-01 17:37   ` Richard Henderson
2022-02-01 11:14 ` [PATCH 10/22] bsd-user: Move system call building to os-syscall.c Warner Losh
2022-02-01 17:38   ` Richard Henderson
2022-02-01 11:14 ` [PATCH 11/22] bsd-user/sycall.c: Now obsolete, remove Warner Losh
2022-02-01 16:35   ` Kyle Evans
2022-02-01 17:38   ` Richard Henderson
2022-02-01 11:14 ` [PATCH 12/22] bsd-user/freebsd/os-syscall.c: Add get_errno and host_to_target_errno Warner Losh
2022-02-01 16:35   ` Kyle Evans
2022-02-01 17:39   ` Richard Henderson
2022-02-01 23:27     ` Warner Losh
2022-02-01 11:14 ` [PATCH 13/22] bsd-user/bsd-file.h: Implementation details for the filesystem calls Warner Losh
2022-02-01 16:47   ` Kyle Evans
2022-02-01 17:43   ` Richard Henderson
2022-02-01 23:55     ` Warner Losh
2022-02-26 16:24     ` Warner Losh
2022-02-01 11:14 ` [PATCH 14/22] bsd-user/freebsd/os-syscall.c: lock_iovec Warner Losh
2022-02-01 16:46   ` Kyle Evans
2022-02-01 21:16   ` Richard Henderson [this message]
2022-02-01 11:14 ` [PATCH 15/22] bsd-user/freebsd/os-syscall.c: unlock_iovec Warner Losh
2022-02-01 16:37   ` Kyle Evans
2022-02-01 21:29   ` Richard Henderson
2022-02-01 11:14 ` [PATCH 16/22] bsd-user/freebsd/os-syscall.c: Tracing and error boilerplate Warner Losh
2022-02-01 21:31   ` Richard Henderson
2022-02-01 11:14 ` [PATCH 17/22] bsd-user: introduce target.h Warner Losh
2022-02-01 16:39   ` Kyle Evans
2022-02-01 21:32   ` Richard Henderson
2022-02-01 11:14 ` [PATCH 18/22] bsd-user: Define target_arg64 Warner Losh
2022-02-01 16:41   ` Kyle Evans
2022-02-01 21:33   ` Richard Henderson
2022-02-01 11:14 ` [PATCH 19/22] bsd-user: Add safe system call macros Warner Losh
2022-02-01 21:33   ` Richard Henderson
2022-02-01 11:14 ` [PATCH 20/22] bsd-user/bsd-file.h: Add implementations for read, pread, readv and preadv Warner Losh
2022-02-01 21:37   ` Richard Henderson
2022-02-02  3:02     ` Warner Losh
2022-02-01 11:14 ` [PATCH 21/22] bsd-user/bsd-file.h: Meat of the write system calls Warner Losh
2022-02-01 21:38   ` Richard Henderson
2022-02-01 11:14 ` [PATCH 22/22] bsd-user/freebsd/os-syscall.c: Implement exit Warner Losh
2022-02-01 16:48   ` Kyle Evans
2022-02-01 21:39   ` Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=3f3af9ba-513e-6f69-7010-9eafd0720180@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=arrowd@FreeBSD.org \
    --cc=brad@comstyle.com \
    --cc=def@FreeBSD.org \
    --cc=imp@bsdimp.com \
    --cc=jrtc27@FreeBSD.org \
    --cc=kevans@freebsd.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).