From: "Michael S. Tsirkin" <mst@redhat.com>
To: Jason Wang <jasowang@redhat.com>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
virtualization@lists.linux-foundation.org
Subject: Re: [PATCH net 2/2] vhost: do not try to access device IOTLB when not initialized
Date: Tue, 23 Jan 2018 17:58:10 +0200 [thread overview]
Message-ID: <20180123175804-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <1516699646-7321-2-git-send-email-jasowang@redhat.com>
On Tue, Jan 23, 2018 at 05:27:26PM +0800, Jason Wang wrote:
> The code will try to access dev->iotlb when processing
> VHOST_IOTLB_INVALIDATE even if it was not initialized which may lead
> to NULL pointer dereference. Fixes this by check dev->iotlb before.
>
> Fixes: 6b1e6cc7855b0 ("vhost: new device IOTLB API")
> Signed-off-by: Jason Wang <jasowang@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> drivers/vhost/vhost.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
> index 549771a..5727b18 100644
> --- a/drivers/vhost/vhost.c
> +++ b/drivers/vhost/vhost.c
> @@ -1015,6 +1015,10 @@ static int vhost_process_iotlb_msg(struct vhost_dev *dev,
> vhost_iotlb_notify_vq(dev, msg);
> break;
> case VHOST_IOTLB_INVALIDATE:
> + if (!dev->iotlb) {
> + ret = -EFAULT;
> + break;
> + }
> vhost_vq_meta_reset(dev);
> vhost_del_umem_range(dev->iotlb, msg->iova,
> msg->iova + msg->size - 1);
> --
> 2.7.4
next prev parent reply other threads:[~2018-01-23 15:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-23 9:27 [PATCH net 1/2] vhost: use mutex_lock_nested() in vhost_dev_lock_vqs() Jason Wang
2018-01-23 9:27 ` [PATCH net 2/2] vhost: do not try to access device IOTLB when not initialized Jason Wang
2018-01-23 15:58 ` Michael S. Tsirkin [this message]
2018-01-23 15:57 ` [PATCH net 1/2] vhost: use mutex_lock_nested() in vhost_dev_lock_vqs() Michael S. Tsirkin
2018-01-24 21:38 ` David Miller
2018-01-24 21:46 ` Michael S. Tsirkin
2018-01-24 21:55 ` David Miller
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=20180123175804-mutt-send-email-mst@kernel.org \
--to=mst@redhat.com \
--cc=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--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).