devargs: restore empty devargs

[dpdk.git] / lib / librte_eal / common / eal_common_devargs.c

diff --git a/lib/librte_eal/common/eal_common_devargs.c b/lib/librte_eal/common/eal_common_devargs.c
index 4c7d11a..eadd719 100644 (file)
--- a/lib/librte_eal/common/eal_common_devargs.c
+++ b/lib/librte_eal/common/eal_common_devargs.c
@@ -48,32 +48,38 @@ struct rte_devargs_list devargs_list =
 int
 rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
 {
-       struct rte_devargs *devargs;
-       char buf[RTE_DEVARGS_LEN];
+       struct rte_devargs *devargs = NULL;
+       char *buf = NULL;
        char *sep;
        int ret;
 
-       ret = snprintf(buf, sizeof(buf), "%s", devargs_str);
-       if (ret < 0 || ret >= (int)sizeof(buf)) {
-               RTE_LOG(ERR, EAL, "user device args too large: <%s>\n",
-                       devargs_str);
-               return -1;
-       }
-
        /* use malloc instead of rte_malloc as it's called early at init */
        devargs = malloc(sizeof(*devargs));
        if (devargs == NULL) {
                RTE_LOG(ERR, EAL, "cannot allocate devargs\n");
-               return -1;
+               goto fail;
        }
        memset(devargs, 0, sizeof(*devargs));
        devargs->type = devtype;
 
+       buf = strdup(devargs_str);
+       if (buf == NULL) {
+               RTE_LOG(ERR, EAL, "cannot allocate temp memory for devargs\n");
+               goto fail;
+       }
+
        /* set the first ',' to '\0' to split name and arguments */
        sep = strchr(buf, ',');
        if (sep != NULL) {
                sep[0] = '\0';
-               snprintf(devargs->args, sizeof(devargs->args), "%s", sep + 1);
+               devargs->args = strdup(sep + 1);
+       } else {
+               devargs->args = strdup("");
+       }
+
+       if (devargs->args == NULL) {
+               RTE_LOG(ERR, EAL, "cannot allocate for devargs args\n");
+               goto fail;
        }
 
        switch (devargs->type) {
@@ -81,28 +87,34 @@ rte_eal_devargs_add(enum rte_devtype devtype, const char *devargs_str)
        case RTE_DEVTYPE_BLACKLISTED_PCI:
                /* try to parse pci identifier */
                if (eal_parse_pci_BDF(buf, &devargs->pci.addr) != 0 &&
-                       eal_parse_pci_DomBDF(buf, &devargs->pci.addr) != 0) {
-                       RTE_LOG(ERR, EAL,
-                               "invalid PCI identifier <%s>\n", buf);
-                       free(devargs);
-                       return -1;
+                   eal_parse_pci_DomBDF(buf, &devargs->pci.addr) != 0) {
+                       RTE_LOG(ERR, EAL, "invalid PCI identifier <%s>\n", buf);
+                       goto fail;
                }
                break;
        case RTE_DEVTYPE_VIRTUAL:
                /* save driver name */
                ret = snprintf(devargs->virtual.drv_name,
-                       sizeof(devargs->virtual.drv_name), "%s", buf);
+                              sizeof(devargs->virtual.drv_name), "%s", buf);
                if (ret < 0 || ret >= (int)sizeof(devargs->virtual.drv_name)) {
-                       RTE_LOG(ERR, EAL,
-                               "driver name too large: <%s>\n", buf);
-                       free(devargs);
-                       return -1;
+                       RTE_LOG(ERR, EAL, "driver name too large: <%s>\n", buf);
+                       goto fail;
                }
                break;
        }
 
+       free(buf);
        TAILQ_INSERT_TAIL(&devargs_list, devargs, next);
        return 0;
+
+fail:
+       if (devargs->args)
+               free(devargs->args);
+       if (buf)
+               free(buf);
+       if (devargs)
+               free(devargs);
+       return -1;
 }
 
 /* count the number of devices of a specified type */