From 3054036f054a7486ae1979ce18d32c6e3d057b26 Mon Sep 17 00:00:00 2001 From: Gaetan Rivet Date: Thu, 3 Aug 2017 14:34:19 +0200 Subject: [PATCH] eal: fix possible crash in hotplug If devargs is NULL, building the full_dev_name will segfault when using strlen on it. Coverity issue: 158630 Fixes: 7e8b26650146 ("eal: fix hotplug add / remove") Signed-off-by: Gaetan Rivet --- lib/librte_eal/common/eal_common_dev.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/lib/librte_eal/common/eal_common_dev.c b/lib/librte_eal/common/eal_common_dev.c index f98302d35e..d19232d796 100644 --- a/lib/librte_eal/common/eal_common_dev.c +++ b/lib/librte_eal/common/eal_common_dev.c @@ -133,16 +133,13 @@ full_dev_name(const char *bus, const char *dev, const char *args) char *name; size_t len; - len = strlen(bus) + 1 + - strlen(dev) + 1 + - strlen(args) + 1; + len = snprintf(NULL, 0, "%s:%s,%s", bus, dev, args); name = calloc(1, len); if (name == NULL) { RTE_LOG(ERR, EAL, "Could not allocate full device name\n"); return NULL; } - snprintf(name, len, "%s:%s,%s", bus, dev, - args ? args : ""); + snprintf(name, len, "%s:%s,%s", bus, dev, args); return name; } -- 2.20.1