diff options
| author | Stefano Garzarella | 2019-05-17 16:45:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-05-25 18:23:22 +0200 |
| commit | 4af8a327aeba102aaa9b78f3451f725bc590b237 (patch) | |
| tree | 85ceb25e441f55f871ccd1b4c3f910e8a800e94a /net/vmw_vsock | |
| parent | tipc: switch order of device registration to fix a crash (diff) | |
| download | kernel-qcow2-linux-4af8a327aeba102aaa9b78f3451f725bc590b237.tar.gz kernel-qcow2-linux-4af8a327aeba102aaa9b78f3451f725bc590b237.tar.xz kernel-qcow2-linux-4af8a327aeba102aaa9b78f3451f725bc590b237.zip | |
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>
Diffstat (limited to 'net/vmw_vsock')
| -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 602715fc9a75..f3f3d06cb6d8 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -786,12 +786,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) |