| author | Stefano Garzarella <sgarzare@redhat.com> | 2019-05-17 14:45:43 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-05-25 16:26:44 (GMT) |
| commit | 4ea082cd3c400cd5bb36a7beb7e441bf3e29350d (patch) | |
| tree | 9685b2566491119b4afc545dacccefa1da09d637 | |
| parent | a336df52d00791b90970a419c5458068ff4e3c26 (diff) | |
| download | common-4ea082cd3c400cd5bb36a7beb7e441bf3e29350d.zip common-4ea082cd3c400cd5bb36a7beb7e441bf3e29350d.tar.gz common-4ea082cd3c400cd5bb36a7beb7e441bf3e29350d.tar.bz2 | |
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: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/vmw_vsock/virtio_transport_common.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index cc4b4ab..aa9d1c7 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -725,12 +725,19 @@ static bool virtio_transport_close(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; bool remove_sock = true; lock_sock(sk); if (sk->sk_type == SOCK_STREAM) 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); if (remove_sock) |