vhost: fix fd leak in kick setup

[dpdk.git] / lib / librte_pci / rte_pci.c

diff --git a/lib/librte_pci/rte_pci.c b/lib/librte_pci/rte_pci.c
index 1a6d748..c91be8b 100644 (file)
--- a/lib/librte_pci/rte_pci.c
+++ b/lib/librte_pci/rte_pci.c
@@ -9,17 +9,18 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <sys/queue.h>
-#include <sys/mman.h>
 
 #include <rte_errno.h>
 #include <rte_interrupts.h>
 #include <rte_log.h>
 #include <rte_bus.h>
+#include <rte_eal_paging.h>
 #include <rte_per_lcore.h>
 #include <rte_memory.h>
 #include <rte_eal.h>
 #include <rte_string_fns.h>
 #include <rte_common.h>
+#include <rte_debug.h>
 
 #include "rte_pci.h"
 
@@ -30,6 +31,16 @@ get_u8_pciaddr_field(const char *in, void *_u8, char dlm)
        uint8_t *u8 = _u8;
        char *end;
 
+       /* empty string is an error though strtoul() returns 0 */
+       if (*in == '\0')
+               return NULL;
+
+       /* PCI field starting with spaces is forbidden.
+        * Negative wrap-around is not reported as an error by strtoul.
+        */
+       if (*in == ' ' || *in == '-')
+               return NULL;
+
        errno = 0;
        val = strtoul(in, &end, 16);
        if (errno != 0 || end[0] != dlm || val > UINT8_MAX) {
@@ -65,11 +76,21 @@ pci_dbdf_parse(const char *input, struct rte_pci_addr *dev_addr)
        unsigned long val;
        char *end;
 
+       /* PCI id starting with spaces is forbidden.
+        * Negative wrap-around is not reported as an error by strtoul.
+        */
+       if (*in == ' ' || *in == '-')
+               return -EINVAL;
+
        errno = 0;
        val = strtoul(in, &end, 16);
-       if (errno != 0 || end[0] != ':' || val > UINT16_MAX)
+       /* Empty string is not an error for strtoul, but the check
+        *   end[0] != ':'
+        * will detect the issue.
+        */
+       if (errno != 0 || end[0] != ':' || val > UINT32_MAX)
                return -EINVAL;
-       dev_addr->domain = (uint16_t)val;
+       dev_addr->domain = (uint32_t)val;
        in = end + 1;
        in = get_u8_pciaddr_field(in, &dev_addr->bus, ':');
        if (in == NULL)
@@ -83,18 +104,6 @@ pci_dbdf_parse(const char *input, struct rte_pci_addr *dev_addr)
        return 0;
 }
 
-int
-eal_parse_pci_BDF(const char *input, struct rte_pci_addr *dev_addr)
-{
-       return pci_bdf_parse(input, dev_addr);
-}
-
-int
-eal_parse_pci_DomBDF(const char *input, struct rte_pci_addr *dev_addr)
-{
-       return pci_dbdf_parse(input, dev_addr);
-}
-
 void
 rte_pci_device_name(const struct rte_pci_addr *addr,
                char *output, size_t size)
@@ -105,13 +114,6 @@ rte_pci_device_name(const struct rte_pci_addr *addr,
                            addr->devid, addr->function) >= 0);
 }
 
-int
-rte_eal_compare_pci_addr(const struct rte_pci_addr *addr,
-                        const struct rte_pci_addr *addr2)
-{
-       return rte_pci_addr_cmp(addr, addr2);
-}
-
 int
 rte_pci_addr_cmp(const struct rte_pci_addr *addr,
             const struct rte_pci_addr *addr2)
@@ -142,42 +144,3 @@ rte_pci_addr_parse(const char *str, struct rte_pci_addr *addr)
                return 0;
        return -1;
 }
-
-
-/* map a particular resource from a file */
-void *
-pci_map_resource(void *requested_addr, int fd, off_t offset, size_t size,
-                int additional_flags)
-{
-       void *mapaddr;
-
-       /* Map the PCI memory resource of device */
-       mapaddr = mmap(requested_addr, size, PROT_READ | PROT_WRITE,
-                       MAP_SHARED | additional_flags, fd, offset);
-       if (mapaddr == MAP_FAILED) {
-               RTE_LOG(ERR, EAL, "%s(): cannot mmap(%d, %p, 0x%lx, 0x%lx): %s (%p)\n",
-                       __func__, fd, requested_addr,
-                       (unsigned long)size, (unsigned long)offset,
-                       strerror(errno), mapaddr);
-       } else
-               RTE_LOG(DEBUG, EAL, "  PCI memory mapped at %p\n", mapaddr);
-
-       return mapaddr;
-}
-
-/* unmap a particular resource */
-void
-pci_unmap_resource(void *requested_addr, size_t size)
-{
-       if (requested_addr == NULL)
-               return;
-
-       /* Unmap the PCI memory resource of device */
-       if (munmap(requested_addr, size)) {
-               RTE_LOG(ERR, EAL, "%s(): cannot munmap(%p, 0x%lx): %s\n",
-                       __func__, requested_addr, (unsigned long)size,
-                       strerror(errno));
-       } else
-               RTE_LOG(DEBUG, EAL, "  PCI memory unmapped at %p\n",
-                               requested_addr);
-}