Jason Wang
2018-Jun-21 05:11 UTC
[PATCH net] vhost_net: validate sock before trying to put its fd
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 at oracle.com>
Signed-off-by: Jason Wang <jasowang at redhat.com>
---
drivers/vhost/net.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index 986058a..b97a994 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -1208,7 +1208,8 @@ 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:
- sockfd_put(sock);
+ if (sock)
+ sockfd_put(sock);
err_vq:
mutex_unlock(&vq->mutex);
err:
--
2.7.4
David Miller
2018-Jun-23 01:24 UTC
[PATCH net] vhost_net: validate sock before trying to put its fd
From: Jason Wang <jasowang at redhat.com> Date: Thu, 21 Jun 2018 13:11:31 +0800> 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 at oracle.com> > Signed-off-by: Jason Wang <jasowang at redhat.com>Applied and queued up for -stable, thanks Jason.