From: "Michael S. Tsirkin" <mst@redhat.com>
To: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Cc: Jason Wang <jasowang@redhat.com>,
kvm@vger.kernel.org, virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Konstantin Khorenko <khorenko@virtuozzo.com>
Subject: Re: [PATCH] vhost: return EINVAL if iovecs size does not match the message size
Date: Thu, 13 Dec 2018 14:55:17 -0500 [thread overview]
Message-ID: <20181213143426-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <20181213145350.5454-1-ptikhomirov@virtuozzo.com>
On Thu, Dec 13, 2018 at 05:53:50PM +0300, Pavel Tikhomirov wrote:
> We've failed to copy and process vhost_iotlb_msg so let userspace at
> least know about it. For instance before these patch the code below runs
> without any error:
>
> int main()
> {
> struct vhost_msg msg;
> struct iovec iov;
> int fd;
>
> fd = open("/dev/vhost-net", O_RDWR);
> if (fd == -1) {
> perror("open");
> return 1;
> }
>
> iov.iov_base = &msg;
> iov.iov_len = sizeof(msg)-4;
>
> if (writev(fd, &iov,1) == -1) {
> perror("writev");
> return 1;
> }
>
> return 0;
> }
>
> Signed-off-by: Pavel Tikhomirov <ptikhomirov@virtuozzo.com>
Thanks for the patch!
> ---
> drivers/vhost/vhost.c | 8 ++++++--
> 1 file changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
> index 3a5f81a66d34..03014224ef13 100644
> --- a/drivers/vhost/vhost.c
> +++ b/drivers/vhost/vhost.c
> @@ -1024,8 +1024,10 @@ ssize_t vhost_chr_write_iter(struct vhost_dev *dev,
> int type, ret;
>
> ret = copy_from_iter(&type, sizeof(type), from);
> - if (ret != sizeof(type))
> + if (ret != sizeof(type)) {
> + ret = -EINVAL;
> goto done;
> + }
>
> switch (type) {
> case VHOST_IOTLB_MSG:
should this be EFAULT rather?
> @@ -1044,8 +1046,10 @@ ssize_t vhost_chr_write_iter(struct vhost_dev *dev,
>
> iov_iter_advance(from, offset);
> ret = copy_from_iter(&msg, sizeof(msg), from);
> - if (ret != sizeof(msg))
> + if (ret != sizeof(msg)) {
> + ret = -EINVAL;
> goto done;
> + }
> if (vhost_process_iotlb_msg(dev, &msg)) {
> ret = -EFAULT;
> goto done;
This too?
> --
> 2.17.1
next prev parent reply other threads:[~2018-12-13 19:55 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-13 14:53 [PATCH] vhost: return EINVAL if iovecs size does not match the message size Pavel Tikhomirov
2018-12-13 19:55 ` Michael S. Tsirkin [this message]
2018-12-14 7:48 ` Pavel Tikhomirov
2018-12-15 19:46 ` David Miller
2018-12-16 19:41 ` Michael S. Tsirkin
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=20181213143426-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=jasowang@redhat.com \
--cc=khorenko@virtuozzo.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=ptikhomirov@virtuozzo.com \
--cc=virtualization@lists.linux-foundation.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).