From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 39EB9A0096 for ; Wed, 8 May 2019 12:16:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2D377378B; Wed, 8 May 2019 12:16:21 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 64B452862 for ; Wed, 8 May 2019 12:16:19 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C3EBB85546; Wed, 8 May 2019 10:16:18 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-210.ams2.redhat.com [10.36.117.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E7221A267; Wed, 8 May 2019 10:16:16 +0000 (UTC) From: Kevin Traynor To: Ilya Maximets Cc: David Marchand , Jens Freimann , Tiwei Bie , dpdk stable Date: Wed, 8 May 2019 11:14:58 +0100 Message-Id: <20190508101534.8984-16-ktraynor@redhat.com> In-Reply-To: <20190508101534.8984-1-ktraynor@redhat.com> References: <20190508101534.8984-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Wed, 08 May 2019 10:16:18 +0000 (UTC) Subject: [dpdk-stable] patch 'vhost: fix device leak on connection add failure' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/13/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/839d3d6aa1f1c26a7611d4086e51469569e9028d Thanks. Kevin Traynor --- >From 839d3d6aa1f1c26a7611d4086e51469569e9028d Mon Sep 17 00:00:00 2001 From: Ilya Maximets Date: Thu, 11 Apr 2019 13:23:06 +0300 Subject: [PATCH] vhost: fix device leak on connection add failure [ upstream commit a21510e750430914a5638a8925e87609a32cbbff ] Need to destroy allocated device if application fails to add new connection or we have fdset failure. Fixes: acbff5c67ea7 ("vhost: fix crash when exceeding file descriptors") Fixes: efba12a78ddf ("vhost: add user callbacks for socket open/close") Reported-by: David Marchand Signed-off-by: Ilya Maximets Reviewed-by: David Marchand Reviewed-by: Jens Freimann Reviewed-by: Tiwei Bie --- lib/librte_vhost/socket.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c index 9883b0491..c2bf023d1 100644 --- a/lib/librte_vhost/socket.c +++ b/lib/librte_vhost/socket.c @@ -241,5 +241,5 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket) "failed to add vhost user connection with fd %d\n", fd); - goto err; + goto err_cleanup; } } @@ -258,5 +258,5 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket) vsocket->notify_ops->destroy_connection(conn->vid); - goto err; + goto err_cleanup; } @@ -268,4 +268,6 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket) return; +err_cleanup: + vhost_destroy_device(vid); err: free(conn); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-05-08 11:05:06.665890432 +0100 +++ 0016-vhost-fix-device-leak-on-connection-add-failure.patch 2019-05-08 11:05:05.791933556 +0100 @@ -1 +1 @@ -From a21510e750430914a5638a8925e87609a32cbbff Mon Sep 17 00:00:00 2001 +From 839d3d6aa1f1c26a7611d4086e51469569e9028d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a21510e750430914a5638a8925e87609a32cbbff ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 3da9de62c..f0fdb83f7 100644 +index 9883b0491..c2bf023d1 100644