diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2019-02-07 14:13:18 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-08 22:32:05 -0800 |
| commit | 225d9464268599a5b4d094d02ec17808e44c7553 (patch) | |
| tree | afec17ea479f9b610d7c8ac6cf0032d7f9a234a8 /net | |
| parent | c09551c6ff7fe16a79a42133bcecba5fc2fc3291 (diff) | |
| download | linux-225d9464268599a5b4d094d02ec17808e44c7553.tar.bz2 | |
vsock: cope with memory allocation failure at socket creation time
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/vmw_vsock/vmci_transport.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index c361ce782412..c3d5ab01fba7 100644 --- a/net/vmw_vsock/vmci_transport.c +++ b/net/vmw_vsock/vmci_transport.c @@ -1651,6 +1651,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. */ |