Merge "DPDK: fix crash at vifdump if there are no eth devices"

Juniper · Jan 27, 2016 · 477f4ac · 477f4ac
2 parents 20b61c9 + 2358fb6
commit 477f4ac
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/dpdk/vr_dpdk_knidev.c b/dpdk/vr_dpdk_knidev.c
@@ -513,7 +513,12 @@ dpdk_knidev_config_network_if(uint8_t port_id, uint8_t if_up)
     return ret;
 }
 
-/* Init KNI */
+/*
+ * vr_dpdk_knidev_init - initializes Kernel Network Interface device using
+ * specified Ethernet device port.
+ *
+ * Returns 0 on success, < 0 otherwise.
+ */
 int
 vr_dpdk_knidev_init(uint8_t port_id, struct vr_interface *vif)
 {
@@ -533,6 +538,13 @@ vr_dpdk_knidev_init(uint8_t port_id, struct vr_interface *vif)
         vr_dpdk.kni_inited = true;
     }
 
+    /* Check if port is valid. */
+    if (!rte_eth_dev_is_valid_port(port_id)) {
+        RTE_LOG(ERR, VROUTER, "    error initializing KNI device %s: invalid eth device %"
+                PRIu8"\n", vif->vif_name, port_id);
+        return -EINVAL;
+    }
+
     /* get eth device info */
     memset(&dev_info, 0, sizeof(dev_info));
     rte_eth_dev_info_get(port_id, &dev_info);