From: Jason Wang <jasowang@redhat.com>
Date: Thu, 21 Jun 2018 05:11:31 +0000 (+0800)
Subject: vhost_net: validate sock before trying to put its fd
X-Git-Tag: Ubuntu-4.15.0-46.49~103
X-Git-Url: https://git.proxmox.com/?p=mirror_ubuntu-bionic-kernel.git;a=commitdiff_plain;h=d4d0e8794afde659fb790a74cd672a064e1a6627

vhost_net: validate sock before trying to put its fd

BugLink: http://bugs.launchpad.net/bugs/1811877

[ 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>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 0020ae906bf9..9c9e9fa70f81 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -1182,7 +1182,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: