Commit be62fb6c authored Feb 07, 2019 by Paolo Abeni Committed by Greg Kroah-Hartman Feb 23, 2019

vsock: cope with memory allocation failure at socket creation time



[ 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: d021c344 ("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>

parent e52cb578

net/vmw_vsock/vmci_transport.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -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.
		*/