lkml.org 
[lkml]   [2018]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 47/92] vhost_net: validate sock before trying to put its fd
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jason Wang <jasowang@redhat.com>

    [ 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>
    ---
    drivers/vhost/net.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/vhost/net.c
    +++ b/drivers/vhost/net.c
    @@ -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:

    \
     
     \ /
      Last update: 2018-07-20 14:52    [W:4.118 / U:0.112 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site