cryptodev: fix crash when querying device by name

This patch fixes a segmentation fault in function
rte_cryptodev_devices_get(), due to incorrect driver name path.
It reworks the function to use correct types and clean up
for visibility.

Coverity issue: 141067
Fixes: 38227c0e3ad2 ("cryptodev: retrieve device info")

Signed-off-by: Slawomir Mrozowicz <slawomirx.mrozowicz@intel.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>

diff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/librte_cryptodev/rte_cryptodev.c
index e557e77..a64320e 100644 (file)
--- a/lib/librte_cryptodev/rte_cryptodev.c
+++ b/lib/librte_cryptodev/rte_cryptodev.c
@@ -482,34 +482,29 @@ rte_cryptodev_count_devtype(enum rte_cryptodev_type type)
        return dev_count;
 }
 
-int
+uint8_t
 rte_cryptodev_devices_get(const char *dev_name, uint8_t *devices,
        uint8_t nb_devices)
 {
-       uint8_t i, cmp, count = 0;
-       struct rte_cryptodev **devs = &rte_cryptodev_globals->devs;
-       struct rte_device *dev;
-
-       for (i = 0; i < rte_cryptodev_globals->max_devs && count < nb_devices;
-                       i++) {
+       uint8_t i, count = 0;
+       struct rte_cryptodev *devs = rte_cryptodev_globals->devs;
+       uint8_t max_devs = rte_cryptodev_globals->max_devs;
 
-               if ((*devs + i)
-                               && (*devs + i)->attached ==
-                                               RTE_CRYPTODEV_ATTACHED) {
+       for (i = 0; i < max_devs && count < nb_devices; i++) {
 
-                       dev = (*devs + i)->device;
+               if (devs[i].attached == RTE_CRYPTODEV_ATTACHED) {
+                       const struct rte_cryptodev_driver *drv = devs[i].driver;
+                       int cmp;
 
-                       if (dev)
-                               cmp = strncmp(dev->driver->name,
-                                               dev_name,
-                                               strlen(dev_name));
+                       if (drv)
+                               cmp = strncmp(drv->pci_drv.driver.name,
+                                               dev_name, strlen(dev_name));
                        else
-                               cmp = strncmp((*devs + i)->data->name,
-                                               dev_name,
-                                               strlen(dev_name));
+                               cmp = strncmp(devs[i].data->name,
+                                               dev_name, strlen(dev_name));
 
                        if (cmp == 0)
-                               devices[count++] = (*devs + i)->data->dev_id;
+                               devices[count++] = devs[i].data->dev_id;
                }
        }
 

diff --git a/lib/librte_cryptodev/rte_cryptodev.h b/lib/librte_cryptodev/rte_cryptodev.h
index 37f08ae..82f3bc3 100644 (file)
--- a/lib/librte_cryptodev/rte_cryptodev.h
+++ b/lib/librte_cryptodev/rte_cryptodev.h
@@ -435,7 +435,7 @@ rte_cryptodev_count_devtype(enum rte_cryptodev_type type);
  * @return
  *   Returns number of attached crypto device.
  */
-int
+uint8_t
 rte_cryptodev_devices_get(const char *dev_name, uint8_t *devices,
                uint8_t nb_devices);
 /*