Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ea082cd authored by Stefano Garzarella's avatar Stefano Garzarella Committed by Greg Kroah-Hartman
Browse files

vsock/virtio: free packets during the socket release 



[ Upstream commit ac03046ece2b158ebd204dfc4896fd9f39f0e6c8 ]

When the socket is released, we should free all packets
queued in the per-socket list in order to avoid a memory
leak.

Signed-off-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a336df52

net/vmw_vsock/virtio_transport_common.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -725,12 +725,19 @@ static bool virtio_transport_close(struct vsock_sock *vsk) 




void virtio_transport_release(struct vsock_sock *vsk)

void virtio_transport_release(struct vsock_sock *vsk)

{

{

	struct virtio_vsock_sock *vvs = vsk->trans;

	struct virtio_vsock_pkt *pkt, *tmp;

	struct sock *sk = &vsk->sk;

	struct sock *sk = &vsk->sk;

	bool remove_sock = true;

	bool remove_sock = true;





	lock_sock(sk);

	lock_sock(sk);

	if (sk->sk_type == SOCK_STREAM)

	if (sk->sk_type == SOCK_STREAM)

		remove_sock = virtio_transport_close(vsk);

		remove_sock = virtio_transport_close(vsk);



	list_for_each_entry_safe(pkt, tmp, &vvs->rx_queue, list) {

		list_del(&pkt->list);

		virtio_transport_free_pkt(pkt);

	}

	release_sock(sk);

	release_sock(sk);





	if (remove_sock)

	if (remove_sock)