From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0AA9AC282E1 for ; Thu, 23 May 2019 19:08:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D601C21850 for ; Thu, 23 May 2019 19:08:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558638532; bh=nOEQA3ZPNlwCk7DcRJEBG8Ie9IeSQaL4Fh5HMp7g8ic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=G+zs6tdraZWHCPRS0Uih4YmpfX5wjoikOPETNonyix1+BrOxVl4eUq7FNViSgx8eu JBiiZrxM9jLUpifhDgKbbIUtv0FS8wa1X1J1my2WrZctAYZrLfdH+QOm9KW2GBzEoD 2wo4ccX3N8PgDgzChEmDuj+IznoNFZUC41NWyyFU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731927AbfEWTIv (ORCPT ); Thu, 23 May 2019 15:08:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:41776 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731921AbfEWTIv (ORCPT ); Thu, 23 May 2019 15:08:51 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 52214217D9; Thu, 23 May 2019 19:08:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558638530; bh=nOEQA3ZPNlwCk7DcRJEBG8Ie9IeSQaL4Fh5HMp7g8ic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=U1NU4ty74D6rJ/FNcI+zJZTT4zkwZ3zOUz2BU1FFBSHPZoK7mOValRnTp86/cDGEH aBuND3hBAmXfTza5IwDZw96dW0T9RzOqEH8lvp9yNrJSGVGSVCrlCoiRs2dQBrIGp6 0TyzRrpsMMdE4Zi3TpIqSvRMkOa6rHMJuj133UTE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stefano Garzarella , "David S. Miller" Subject: [PATCH 4.9 05/53] vsock/virtio: free packets during the socket release Date: Thu, 23 May 2019 21:05:29 +0200 Message-Id: <20190523181711.732195361@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190523181710.981455400@linuxfoundation.org> References: <20190523181710.981455400@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Stefano Garzarella [ 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 Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/vmw_vsock/virtio_transport_common.c | 7 +++++++ 1 file changed, 7 insertions(+) --- 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(struc 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)