From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id ADBC0A04B1 for ; Mon, 23 Nov 2020 18:13:16 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 67A62C8F8; Mon, 23 Nov 2020 18:13:15 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id BE7F0C922 for ; Mon, 23 Nov 2020 18:13:11 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606151590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=sWRGQZ8KIWo7AOn3kC47vwVC946Myvk9kUhF+Jr60mY=; b=cDIbNNr7fZWnZgkPY3pOn3lc22Uy8ZfsfIfSdjTX1QEeUrvobTgEDkeRrxh7q2p/eyEaSm cYfIa7kw6htfc0dQ/9J98MCyZL9Fa2emy8ao5yR4Oq0YTZQakUyOIMmXv8ccDM+tsHBwfJ NJljh5ZatzV5MOhDRMZOB//N78PLGjQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-417-SHlYQzUdNzy-Syxs8-CbKQ-1; Mon, 23 Nov 2020 12:13:07 -0500 X-MC-Unique: SHlYQzUdNzy-Syxs8-CbKQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 488C3873166; Mon, 23 Nov 2020 17:13:06 +0000 (UTC) Received: from rh.redhat.com (ovpn-112-19.ams2.redhat.com [10.36.112.19]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC2AF60C04; Mon, 23 Nov 2020 17:13:04 +0000 (UTC) From: Kevin Traynor To: Maxime Coquelin Cc: Xuan Ding , Chenbo Xia , Xueming Li , dpdk stable Date: Mon, 23 Nov 2020 17:12:07 +0000 Message-Id: <20201123171222.79398-15-ktraynor@redhat.com> In-Reply-To: <20201123171222.79398-1-ktraynor@redhat.com> References: <20201123171222.79398-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'vhost: fix fd leak in dirty logging setup' has been queued to LTS release 18.11.11 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.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/27/20. 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/34ed9a3f953af3ac036f9cf6d14d397b251d3bdb Thanks. Kevin. --- >From 34ed9a3f953af3ac036f9cf6d14d397b251d3bdb Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Thu, 12 Nov 2020 18:10:28 +0100 Subject: [PATCH] vhost: fix fd leak in dirty logging setup [ upstream commit 6dc3f119ce7310e4e473e5759885ac773dbb12ef ] This patch fixes a file descriptor leak which happens in the error path of vhost_user_set_log_base(). Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application") Reported-by: Xuan Ding Signed-off-by: Maxime Coquelin Reviewed-by: Chenbo Xia Reviewed-by: Xueming Li --- lib/librte_vhost/vhost_user.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index f35ea97b6a..ca6f8338cc 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1609,5 +1609,5 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg, "invalid log base msg size: %"PRId32" != %d\n", msg->size, (int)sizeof(VhostUserLog)); - return VH_RESULT_ERR; + goto close_msg_fds; } @@ -1620,5 +1620,5 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg, "log offset %#"PRIx64" and log size %#"PRIx64" overflow\n", off, size); - return VH_RESULT_ERR; + goto close_msg_fds; } @@ -1657,4 +1657,8 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg, return VH_RESULT_REPLY; + +close_msg_fds: + close_msg_fds(msg); + return VH_RESULT_ERR; } -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-23 17:10:14.351861789 +0000 +++ 0015-vhost-fix-fd-leak-in-dirty-logging-setup.patch 2020-11-23 17:10:13.995061587 +0000 @@ -1 +1 @@ -From 6dc3f119ce7310e4e473e5759885ac773dbb12ef Mon Sep 17 00:00:00 2001 +From 34ed9a3f953af3ac036f9cf6d14d397b251d3bdb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 6dc3f119ce7310e4e473e5759885ac773dbb12ef ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 3898c93d1f..23c115f994 100644 +index f35ea97b6a..ca6f8338cc 100644 @@ -24 +25 @@ -@@ -2087,5 +2087,5 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg, +@@ -1609,5 +1609,5 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg, @@ -27 +28 @@ -- return RTE_VHOST_MSG_RESULT_ERR; +- return VH_RESULT_ERR; @@ -31 +32 @@ -@@ -2098,5 +2098,5 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg, +@@ -1620,5 +1620,5 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg, @@ -34 +35 @@ -- return RTE_VHOST_MSG_RESULT_ERR; +- return VH_RESULT_ERR; @@ -38 +39 @@ -@@ -2135,4 +2135,8 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg, +@@ -1657,4 +1657,8 @@ vhost_user_set_log_base(struct virtio_net **pdev, struct VhostUserMsg *msg, @@ -40 +41 @@ - return RTE_VHOST_MSG_RESULT_REPLY; + return VH_RESULT_REPLY; @@ -44 +45 @@ -+ return RTE_VHOST_MSG_RESULT_ERR; ++ return VH_RESULT_ERR;