From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id B9A881B4AA for ; Thu, 29 Nov 2018 14:24:24 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2CD7783F3D; Thu, 29 Nov 2018 13:24:24 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-230.ams2.redhat.com [10.36.117.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9018D1019626; Thu, 29 Nov 2018 13:24:22 +0000 (UTC) From: Kevin Traynor To: Ilya Maximets Cc: Maxime Coquelin , dpdk stable Date: Thu, 29 Nov 2018 13:21:21 +0000 Message-Id: <20181129132128.7609-81-ktraynor@redhat.com> In-Reply-To: <20181129132128.7609-1-ktraynor@redhat.com> References: <20181129132128.7609-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 29 Nov 2018 13:24:24 +0000 (UTC) Subject: [dpdk-stable] patch 'eal/bsd: fix possible IOPL fd leak' has been queued to stable release 18.08.1 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: , X-List-Received-Date: Thu, 29 Nov 2018 13:24:25 -0000 Hi, FYI, your patch has been queued to stable release 18.08.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 12/08/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From c98848ffeb72fdeb8f140f17d7ab55da37bac2a5 Mon Sep 17 00:00:00 2001 From: Ilya Maximets Date: Fri, 23 Nov 2018 18:39:19 +0300 Subject: [PATCH] eal/bsd: fix possible IOPL fd leak [ upstream commit 9e8b90fc6de98989583c9468769e5898bf6e9e0d ] If rte_eal_iopl_init() will be called more than once we'll leak the file descriptor. Fixes: b46fe31862ec ("eal/bsd: fix virtio on FreeBSD") Signed-off-by: Ilya Maximets Reviewed-by: Maxime Coquelin --- lib/librte_eal/bsdapp/eal/eal.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index d7ae9d686..05ba83db2 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -545,7 +545,9 @@ int rte_eal_iopl_init(void) { - static int fd; + static int fd = -1; + + if (fd < 0) + fd = open("/dev/io", O_RDWR); - fd = open("/dev/io", O_RDWR); if (fd < 0) return -1; -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 13:11:37.039263697 +0000 +++ 0080-eal-bsd-fix-possible-IOPL-fd-leak.patch 2018-11-29 13:11:35.000000000 +0000 @@ -1,13 +1,14 @@ -From 9e8b90fc6de98989583c9468769e5898bf6e9e0d Mon Sep 17 00:00:00 2001 +From c98848ffeb72fdeb8f140f17d7ab55da37bac2a5 Mon Sep 17 00:00:00 2001 From: Ilya Maximets Date: Fri, 23 Nov 2018 18:39:19 +0300 Subject: [PATCH] eal/bsd: fix possible IOPL fd leak +[ upstream commit 9e8b90fc6de98989583c9468769e5898bf6e9e0d ] + If rte_eal_iopl_init() will be called more than once we'll leak the file descriptor. Fixes: b46fe31862ec ("eal/bsd: fix virtio on FreeBSD") -Cc: stable@dpdk.org Signed-off-by: Ilya Maximets Reviewed-by: Maxime Coquelin @@ -16,10 +17,10 @@ 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c -index 508cbc46f..b8152a75c 100644 +index d7ae9d686..05ba83db2 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c -@@ -557,7 +557,9 @@ int +@@ -545,7 +545,9 @@ int rte_eal_iopl_init(void) { - static int fd;