netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jason Wang <jasowang@redhat.com>
To: netdev@vger.kernel.org, xma@us.ibm.com, davem@davemloft.net,
	linux-kernel@vger.kernel.org, mst@redhat.com
Cc: ebiederm@xmission.com
Subject: [PATCH 5/6] vhost_net: fix use after free of vq->ubufs
Date: Mon, 16 Apr 2012 14:08:25 +0800	[thread overview]
Message-ID: <20120416060825.14140.32069.stgit@intel-e5620-16-2.englab.nay.redhat.com> (raw)
In-Reply-To: <20120416060749.14140.19433.stgit@intel-e5620-16-2.englab.nay.redhat.com>

When zerocopy socket is used, ubufs pointer were used in handle_tx()
without any validation. This would cause NULL pointer deference after
it has been freed in vhost_net_set_backend(). Fix this by check the
pointer before using it.

Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 drivers/vhost/net.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index f0da2c3..29abd65 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -163,10 +163,15 @@ static void handle_tx(struct vhost_net *net)
 	mutex_lock(&vq->mutex);
 	vhost_disable_notify(&net->dev, vq);
 
+	zcopy = vhost_sock_zcopy(sock);
+	if (zcopy && !vq->ubufs) {
+		mutex_unlock(&vq->mutex);
+		return;
+	}
+
 	if (wmem < sock->sk->sk_sndbuf / 2)
 		tx_poll_stop(net);
 	hdr_size = vq->vhost_hlen;
-	zcopy = vhost_sock_zcopy(sock);
 
 	for (;;) {
 		/* Release DMAs done buffers first */

  parent reply	other threads:[~2012-04-16  6:08 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-16  6:07 [PATCH 1/6] macvtap: zerocopy: fix offset calculation when building skb Jason Wang
2012-04-16  6:07 ` [PATCH 2/6] macvtap: zerocopy: fix truesize underestimation Jason Wang
2012-04-16  7:14   ` Michael S. Tsirkin
2012-04-16  8:23     ` Jason Wang
2012-04-16  8:49     ` Eric Dumazet
2012-04-16 13:25       ` Michael S. Tsirkin
2012-04-16  6:08 ` [PATCH 3/6] macvtap: zerocopy: validate vector length before pinning user pages Jason Wang
2012-04-16  6:53   ` Eric Dumazet
2012-04-16  8:21     ` Jason Wang
2012-04-17  5:33       ` Eric Dumazet
2012-04-17  5:43         ` Michael S. Tsirkin
2012-04-17  6:19     ` Michael S. Tsirkin
2012-04-16  7:58   ` Michael S. Tsirkin
2012-04-16  6:08 ` [PATCH 4/6] macvtap: zerocopy: set SKBTX_DEV_ZEROCOPY only when skb is built successfully Jason Wang
2012-04-16  6:08 ` Jason Wang [this message]
2012-04-16 13:28   ` [PATCH 5/6] vhost_net: fix use after free of vq->ubufs Michael S. Tsirkin
2012-04-17  3:19     ` Jason Wang
2012-04-17 10:22       ` Michael S. Tsirkin
2012-04-17 10:47         ` Jason Wang
2012-04-16  6:08 ` [PATCH 6/6] vhost_net: don't poll on -EFAULT Jason Wang
2012-04-16  7:16   ` Michael S. Tsirkin
2012-04-16  8:28     ` Jason Wang
2012-04-16 13:39       ` Michael S. Tsirkin
2012-04-17  3:27         ` Jason Wang
2012-04-17  4:57           ` Michael S. Tsirkin
2012-04-17  5:54             ` Jason Wang
2012-04-17  6:07               ` Michael S. Tsirkin
2012-04-17  6:30                 ` Jason Wang
2012-04-17 10:18                   ` Michael S. Tsirkin
2012-04-17 10:46                     ` Jason Wang

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=20120416060825.14140.32069.stgit@intel-e5620-16-2.englab.nay.redhat.com \
    --to=jasowang@redhat.com \
    --cc=davem@davemloft.net \
    --cc=ebiederm@xmission.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=netdev@vger.kernel.org \
    --cc=xma@us.ibm.com \
    /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).