Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp2136206yba; Fri, 10 May 2019 06:52:38 -0700 (PDT) X-Google-Smtp-Source: APXvYqyRdxonxrnR3uagqvPBAAQncNOOkR6p4pN1He01dU+bvEAyS750QyE1T0exUCBcygsuXb9u X-Received: by 2002:a62:4d03:: with SMTP id a3mr14571527pfb.2.1557496358331; Fri, 10 May 2019 06:52:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557496358; cv=none; d=google.com; s=arc-20160816; b=LrYHSw3ndX6obBokhSqNWU+7+Q++WgEbIiIJ5WPftaMvh7e/7uHiC16HAa1AK3pufS GQMBpw2UXuAAqkp1dDoYK6tv/4tz7g0qPmEzZJmwi1MTLbPO324YjMzVsnLjpWG62cE1 ihfq92Ygtwy0+H1PzsxD2ZbqQhYn/nhXtnZD9A4GlRzV7ci9Zj4o2bFkGzKfpk/t96p0 PJm+3FnzxkznCV5sW83Sb+XjfxtAiYYZ82QIJ/NxRm3kPlEaVVP6eXiiOwL/bkvBFFyJ ZWJVjtPSt82aPJSUTCSLTwu2slzBQAiNUg1N8tqPr7lJCghl5lpef8YM1XywILWfSJXC Q0IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=MBi1c4AmZ2zpSl2SP1Cln9vTyHDD+x1wcNYNTtAZZnw=; b=efHSUUBAdLco/TWV92fQR+HaBApNb5KYVI3eAs/LLtJ0jjGB24XcRiDdXpD2OGeWe1 1NbbqyUB53UjeE45O9CMdUlGrhfuid8zwKcBHq/NamWnprVn88H93evQeY9hMPJHTkD5 OUrvT2dY9zSCOZbSpLeWMSwyRa52ESs4YAuBhN3Dx4SuDRe4bmGJvcFjbaeVqOOPlXO8 l7lLkSnFe8M2llAgGGZ7D0lrh/8QQGHjy7t3uGGPa51iWuAAkclUrGqKk99mYOO0vBym mNhJ1hRxeyHkThVLwtyy7vtH8jqa7tayvAIZpfUD3JppSObC8aISe4/pu1dBI7c1saD0 fhPA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y8si7713028pgo.168.2019.05.10.06.52.21; Fri, 10 May 2019 06:52:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727589AbfEJM7M (ORCPT + 99 others); Fri, 10 May 2019 08:59:12 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48832 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727562AbfEJM7L (ORCPT ); Fri, 10 May 2019 08:59:11 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6A7A786678; Fri, 10 May 2019 12:59:11 +0000 (UTC) Received: from steredhat.redhat.com (ovpn-117-202.ams2.redhat.com [10.36.117.202]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66C2D5D6A9; Fri, 10 May 2019 12:59:00 +0000 (UTC) From: Stefano Garzarella To: netdev@vger.kernel.org Cc: "David S. Miller" , "Michael S. Tsirkin" , virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Stefan Hajnoczi , Jason Wang Subject: [PATCH v2 2/8] vsock/virtio: free packets during the socket release Date: Fri, 10 May 2019 14:58:37 +0200 Message-Id: <20190510125843.95587-3-sgarzare@redhat.com> In-Reply-To: <20190510125843.95587-1-sgarzare@redhat.com> References: <20190510125843.95587-1-sgarzare@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Fri, 10 May 2019 12:59:11 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- net/vmw_vsock/virtio_transport_common.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index 0248d6808755..65c8b4a23f2b 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c @@ -827,12 +827,20 @@ 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_buf *buf; struct sock *sk = &vsk->sk; bool remove_sock = true; lock_sock(sk); if (sk->sk_type == SOCK_STREAM) remove_sock = virtio_transport_close(vsk); + while (!list_empty(&vvs->rx_queue)) { + buf = list_first_entry(&vvs->rx_queue, + struct virtio_vsock_buf, list); + list_del(&buf->list); + virtio_transport_free_buf(buf); + } release_sock(sk); if (remove_sock) -- 2.20.1