From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Monjalon Subject: Re: [PATCH] pci: fix closing an unopened file descriptor Date: Thu, 12 Sep 2013 17:28:46 +0200 Message-ID: <201309121728.46471.thomas.monjalon@6wind.com> References: <1378280075-2076-1-git-send-email-mukawa@igel.co.jp> Mime-Version: 1.0 Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: dev-VfR2kkLFssw@public.gmane.org To: Tetsuya Mukawa Return-path: In-Reply-To: <1378280075-2076-1-git-send-email-mukawa-AlSX/UN32fvPDbFq/vQRIQ@public.gmane.org> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces-VfR2kkLFssw@public.gmane.org Sender: "dev" 04/09/2013 09:34, Tetsuya Mukawa : > If CONFIG_RTE_EAL_UNBIND_PORTS is set and virtio-net is used, an unopened > file descriptor will be illegally closed in the finalized phase of EAL. > The fix adds a correct initial value to the file descriptor, and check it > before closing it. > > Signed-off-by: Tetsuya Mukawa Thanks for the patch. I have reproduced the issue only once. It seems that fd 0 is open most of the time. But the patch seems OK so I applied it with light modifications: --- pci: fix closing an unopened file descriptor If CONFIG_RTE_EAL_UNBIND_PORTS is set and a non Intel PMD is used, an unopened file descriptor will be illegally closed in the finalized phase of EAL. The fix adds a correct initial value to the file descriptor, and check it before closing it. Signed-off-by: Tetsuya Mukawa Acked-by: Thomas Monjalon --- a/lib/librte_eal/linuxapp/eal/eal_pci.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci.c @@ -514,6 +514,7 @@ pci_scan_one(const char *dirname, uint16_t domain, uint8_t bus, } memset(dev, 0, sizeof(*dev)); + dev->intr_handle.fd = -1; dev->addr.domain = domain; dev->addr.bus = bus; dev->addr.devid = devid; @@ -718,7 +719,7 @@ pci_exit_process(struct rte_pci_device *dev) RTE_LOG(ERR, EAL, "Error with munmap\n"); return -1; } - if (close(dev->intr_handle.fd) == -1){ + if ((dev->intr_handle.fd != -1) && (close(dev->intr_handle.fd) == -1)) { RTE_LOG(ERR, EAL, "Error closing interrupt handle\n"); return -1; }