diff options
author | Jason Wang <jasowang@redhat.com> | 2012-05-01 23:42:23 -0400 |
---|---|---|
committer | Michael S. Tsirkin <mst@redhat.com> | 2012-05-02 11:22:22 -0400 |
commit | c460f0573941cb28dc7f35595679c3508f0ce41f (patch) | |
tree | 9d25dc66fdc5030ce551c6d2393ee1c23932f4b3 /drivers/vhost | |
parent | b92946e2919134ebe2a4083e4302236295ea2a73 (diff) |
vhost_net: zerocopy: fix possible NULL pointer dereference of vq->bufs
When we want to disable vhost_net backend while there's a tx work, a possible
NULL pointer defernece may happen we we try to deference the vq->bufs after
vhost_net_set_backend() assign a NULL to it.
As suggested by Michael, fix this by checking the vq->bufs instead of
vhost_sock_zcopy().
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'drivers/vhost')
-rw-r--r-- | drivers/vhost/net.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index 1f21d2a1e528..35abe9019ba7 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c | |||
@@ -166,7 +166,7 @@ static void handle_tx(struct vhost_net *net) | |||
166 | if (wmem < sock->sk->sk_sndbuf / 2) | 166 | if (wmem < sock->sk->sk_sndbuf / 2) |
167 | tx_poll_stop(net); | 167 | tx_poll_stop(net); |
168 | hdr_size = vq->vhost_hlen; | 168 | hdr_size = vq->vhost_hlen; |
169 | zcopy = vhost_sock_zcopy(sock); | 169 | zcopy = vq->ubufs; |
170 | 170 | ||
171 | for (;;) { | 171 | for (;;) { |
172 | /* Release DMAs done buffers first */ | 172 | /* Release DMAs done buffers first */ |