diff options
| author | Jason Wang <jasowang@redhat.com> | 2018-06-21 13:11:31 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-22 15:16:02 +0200 |
| commit | 05b2a649775fca92a36800905f762d72993cc505 (patch) | |
| tree | ad6ece20ad9d559052432de9225e22ed49944bd2 | |
| parent | 6fd372a73fa61d351a476060f1ce3e717770a6df (diff) | |
| download | linux-stable-05b2a649775fca92a36800905f762d72993cc505.tar.gz linux-stable-05b2a649775fca92a36800905f762d72993cc505.tar.bz2 linux-stable-05b2a649775fca92a36800905f762d72993cc505.zip | |
vhost_net: validate sock before trying to put its fd
[ Upstream commit b8f1f65882f07913157c44673af7ec0b308d03eb ]
Sock will be NULL if we pass -1 to vhost_net_set_backend(), but when
we meet errors during ubuf allocation, the code does not check for
NULL before calling sockfd_put(), this will lead NULL
dereferencing. Fixing by checking sock pointer before.
Fixes: bab632d69ee4 ("vhost: vhost TX zero-copy support")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/vhost/net.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index eeaf6739215f..dd4eb986f693 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c @@ -1219,7 +1219,8 @@ err_used: if (ubufs) vhost_net_ubuf_put_wait_and_free(ubufs); err_ubufs: - sockfd_put(sock); + if (sock) + sockfd_put(sock); err_vq: mutex_unlock(&vq->mutex); err: |