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 92527A04B1 for ; Mon, 23 Nov 2020 18:13:18 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8A492C900; Mon, 23 Nov 2020 18:13:17 +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 D1B74C8E4 for ; Mon, 23 Nov 2020 18:13:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606151595; 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=5OklekQBO7Bbx43YRtLt7r0WeRytJ/QnqXEhsSp1h7U=; b=HRm9YmITtVihrRx+vDkKZI63NCvTnhNHpf+Q5JnIivddJfzLQZ9lYKQ6oANwzVqrD51xMY vOQB94FfVuJZ0H8G67qZC/iJynSGworAkbFMASMP8zvu7hBHeaeajto/CkUFuSoIgZAwZM 31H1Wxfh4rZJ26cvF909ToAIztOZVNc= 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-273-5wppbrdXMCGcAerl0lkNHw-1; Mon, 23 Nov 2020 12:13:12 -0500 X-MC-Unique: 5wppbrdXMCGcAerl0lkNHw-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 E36671034B21; Mon, 23 Nov 2020 17:13:10 +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 9782960C04; Mon, 23 Nov 2020 17:13:06 +0000 (UTC) From: Kevin Traynor To: Maxime Coquelin Cc: Chenbo Xia , Xueming Li , dpdk stable Date: Mon, 23 Nov 2020 17:12:08 +0000 Message-Id: <20201123171222.79398-16-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 kick 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/bac2835e77a86ae2406e67bf3b98af165e79c7e7 Thanks. Kevin. --- >From bac2835e77a86ae2406e67bf3b98af165e79c7e7 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Thu, 12 Nov 2020 18:10:29 +0100 Subject: [PATCH] vhost: fix fd leak in kick setup [ upstream commit bc900f86aa943006b9f97f3297aeed5ef3caaf5e ] This patch fixes a file descriptor leak which happens in the error path of vhost_user_set_vring_kick(). Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application") Signed-off-by: Maxime Coquelin Reviewed-by: Chenbo Xia Reviewed-by: Xueming Li --- lib/librte_vhost/vhost_user.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index ca6f8338cc..5f46897e5d 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1382,6 +1382,10 @@ vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg, /* Interpret ring addresses only when ring is started. */ dev = translate_ring_addresses(dev, file.index); - if (!dev) + if (!dev) { + if (file.fd != VIRTIO_INVALID_EVENTFD) + close(file.fd); + return VH_RESULT_ERR; + } *pdev = dev; -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-23 17:10:14.375261430 +0000 +++ 0016-vhost-fix-fd-leak-in-kick-setup.patch 2020-11-23 17:10:13.997061589 +0000 @@ -1 +1 @@ -From bc900f86aa943006b9f97f3297aeed5ef3caaf5e Mon Sep 17 00:00:00 2001 +From bac2835e77a86ae2406e67bf3b98af165e79c7e7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit bc900f86aa943006b9f97f3297aeed5ef3caaf5e ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 23c115f994..45c8ac09da 100644 +index ca6f8338cc..5f46897e5d 100644 @@ -23 +24 @@ -@@ -1859,6 +1859,10 @@ vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg, +@@ -1382,6 +1382,10 @@ vhost_user_set_vring_kick(struct virtio_net **pdev, struct VhostUserMsg *msg, @@ -31 +32 @@ - return RTE_VHOST_MSG_RESULT_ERR; + return VH_RESULT_ERR;