Commit 7eba6537 authored Jun 21, 2018 by Jason Wang Committed by Greg Kroah-Hartman Jul 22, 2018

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: bab632d6 ("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>

parent 2dc4696e

drivers/vhost/net.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1186,6 +1186,7 @@ static long vhost_net_set_backend(struct vhost_net *n, unsigned index, int fd)
		if (ubufs)
		vhost_net_ubuf_put_wait_and_free(ubufs);
		err_ubufs:
		if (sock)
		sockfd_put(sock);
		err_vq:
		mutex_unlock(&vq->mutex);