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 E044FA0093 for ; Thu, 28 May 2020 18:26:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B29731DC33; Thu, 28 May 2020 18:26:10 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id E404A1DC1A for ; Thu, 28 May 2020 18:26:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683169; 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=MHLdcq/iB9WOlEJj2/nbS3Mr7bv9qRZ+1NoJeNq+DLo=; b=Ra8fE9MimmbnYC4v/52TYT44nXBGuTrA6UNeR6Y1Sa9+rm/Dm9pAM2Uzlx5nEdpIgMd+rO nEG94+HdV1iqEPzJ9q48zFOchmqbdUSskifBzKGZtM+BOUWoC5IFqxcpKOlMYAx3OLQiN2 s6do/hPW55ZtowEfYWGLBZxa9WmqE6A= 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-441-Feb8D12COCCnQg_a5gklxQ-1; Thu, 28 May 2020 12:26:06 -0400 X-MC-Unique: Feb8D12COCCnQg_a5gklxQ-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 5FD3E1054F93; Thu, 28 May 2020 16:26:05 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4F90E60C05; Thu, 28 May 2020 16:26:04 +0000 (UTC) From: Kevin Traynor To: Yunjian Wang Cc: Ferruh Yigit , Stephen Hemminger , dpdk stable Date: Thu, 28 May 2020 17:23:09 +0100 Message-Id: <20200528162322.7863-82-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/tap: fix fd leak on creation failure' has been queued to LTS release 18.11.9 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/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/78d8e9128ea4c081f9ee27d56265f249e1aebbe7 Thanks. Kevin. --- >From 78d8e9128ea4c081f9ee27d56265f249e1aebbe7 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Thu, 16 Apr 2020 11:04:56 +0800 Subject: [PATCH] net/tap: fix fd leak on creation failure [ upstream commit cbf8909b3aa16c2b1807bd980aad56d8d1e9362e ] When eth_dev_tap_create() is failed, nlsk_fd and ka_fd won't be closed thus leading fds leak. Zero is a valid fd. Ultimately leads to a valid fd was closed by mistake. Fixes: bf7b7f437b49 ("net/tap: create netdevice during probing") Fixes: cb7e68da630a ("net/tap: fix cleanup on allocation failure") Signed-off-by: Yunjian Wang Reviewed-by: Ferruh Yigit Acked-by: Stephen Hemminger --- drivers/net/tap/rte_eth_tap.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 5e627bbdd8..a1e7eb2bde 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -1741,4 +1741,6 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name, snprintf(pmd->name, sizeof(pmd->name), "%s", tap_name); pmd->type = type; + pmd->ka_fd = -1; + pmd->nlsk_fd = -1; pmd->ioctl_sock = socket(AF_INET, SOCK_DGRAM, 0); @@ -1771,5 +1773,4 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name, /* Presetup the fds to -1 as being not valid */ - pmd->ka_fd = -1; for (i = 0; i < RTE_PMD_TAP_MAX_QUEUES; i++) { process_private->rxq_fds[i] = -1; @@ -1912,5 +1913,9 @@ error_remote: error_exit: - if (pmd->ioctl_sock > 0) + if (pmd->nlsk_fd != -1) + close(pmd->nlsk_fd); + if (pmd->ka_fd != -1) + close(pmd->ka_fd); + if (pmd->ioctl_sock != -1) close(pmd->ioctl_sock); /* mac_addrs must not be freed alone because part of dev_private */ -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:03.348292673 +0100 +++ 0082-net-tap-fix-fd-leak-on-creation-failure.patch 2020-05-28 17:12:59.170554839 +0100 @@ -1 +1 @@ -From cbf8909b3aa16c2b1807bd980aad56d8d1e9362e Mon Sep 17 00:00:00 2001 +From 78d8e9128ea4c081f9ee27d56265f249e1aebbe7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cbf8909b3aa16c2b1807bd980aad56d8d1e9362e ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index 41ea54888e..fea464c3d2 100644 +index 5e627bbdd8..a1e7eb2bde 100644 @@ -25,2 +26,2 @@ -@@ -1824,4 +1824,6 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name, - strlcpy(pmd->name, tap_name, sizeof(pmd->name)); +@@ -1741,4 +1741,6 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name, + snprintf(pmd->name, sizeof(pmd->name), "%s", tap_name); @@ -32 +33 @@ -@@ -1854,5 +1856,4 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, const char *tap_name, +@@ -1771,5 +1773,4 @@ eth_dev_tap_create(struct rte_vdev_device *vdev, char *tap_name, @@ -38 +39 @@ -@@ -1994,5 +1995,9 @@ error_remote: +@@ -1912,5 +1913,9 @@ error_remote: