redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

vhost_net: validate sock before trying to put its fd 

[ Upstream commit b8f1f65882 ]

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: bab632d69e ("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>
pull/10/head
Jason Wang 2018-06-21 13:11:31 +08:00 committed by Greg Kroah-Hartman
parent 2dc4696ee6
commit 7eba6537c3
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/vhost/net.c
View File

@ -1186,7 +1186,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: