diff options
author | Jason Wang <jasowang@redhat.com> | 2018-06-21 01:11:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-06-22 21:23:49 -0400 |
commit | b8f1f65882f07913157c44673af7ec0b308d03eb (patch) | |
tree | 106b3508db9867582594c1f7d7e740afd350c6be | |
parent | e5ab564c9ebee77794842ca7d7476147b83d6a27 (diff) |
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@oracle.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-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 686dc670fd29..29756d88799b 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c | |||
@@ -1226,7 +1226,8 @@ err_used: | |||
1226 | if (ubufs) | 1226 | if (ubufs) |
1227 | vhost_net_ubuf_put_wait_and_free(ubufs); | 1227 | vhost_net_ubuf_put_wait_and_free(ubufs); |
1228 | err_ubufs: | 1228 | err_ubufs: |
1229 | sockfd_put(sock); | 1229 | if (sock) |
1230 | sockfd_put(sock); | ||
1230 | err_vq: | 1231 | err_vq: |
1231 | mutex_unlock(&vq->mutex); | 1232 | mutex_unlock(&vq->mutex); |
1232 | err: | 1233 | err: |