lkml.org 
[lkml]   [2019]   [Feb]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 02/20] vsock: cope with memory allocation failure at socket creation time
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

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

    [ Upstream commit 225d9464268599a5b4d094d02ec17808e44c7553 ]

    In the unlikely event that the kmalloc call in vmci_transport_socket_init()
    fails, we end-up calling vmci_transport_destruct() with a NULL vmci_trans()
    and oopsing.

    This change addresses the above explicitly checking for zero vmci_trans()
    at destruction time.

    Reported-by: Xiumei Mu <xmu@redhat.com>
    Fixes: d021c344051a ("VSOCK: Introduce VM Sockets")
    Signed-off-by: Paolo Abeni <pabeni@redhat.com>
    Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
    Reviewed-by: Jorgen Hansen <jhansen@vmware.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/vmw_vsock/vmci_transport.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
    index 008f3424dcbce..102bf9194662c 100644
    --- a/net/vmw_vsock/vmci_transport.c
    +++ b/net/vmw_vsock/vmci_transport.c
    @@ -1656,6 +1656,10 @@ static void vmci_transport_cleanup(struct work_struct *work)

    static void vmci_transport_destruct(struct vsock_sock *vsk)
    {
    + /* transport can be NULL if we hit a failure at init() time */
    + if (!vmci_trans(vsk))
    + return;
    +
    /* Ensure that the detach callback doesn't use the sk/vsk
    * we are about to destruct.
    */
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-02-21 15:50    [W:4.130 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site