From: Panu Matilainen <pmatilai@redhat.com>
Date: Mon, 23 Nov 2015 12:05:55 +0000 (+0200)
Subject: eal: fix plugin loading without requiring full path
X-Git-Tag: spdx-start~8016
X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=26852dcd0d9ef9456cfa55947b2020e584380b23;p=dpdk.git

eal: fix plugin loading without requiring full path

The added error checking on plugin initialization in
commit 9f8eb1d9ca0f56d6292db5858c52e6873d0abe51 broke the ability of
loading plugins by their basename from default linker locations.
Only use stat() for directory discovery and leave error handling
to dlopen() to restore former behavior.

Fixes: 9f8eb1d9ca0f ("eal: support driver loading from directory")

Signed-off-by: Panu Matilainen <pmatilai@redhat.com>
---

diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c
index bed7385700..a19909317a 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -216,22 +216,15 @@ eal_plugins_init(void)
 
 	TAILQ_FOREACH(solib, &solib_list, next) {
 		struct stat sb;
-		if (stat(solib->name, &sb) == -1) {
-			RTE_LOG(ERR, EAL, "Invalid plugin specified: %s: %s\n",
-				solib->name, strerror(errno));
-			return -1;
-		}
 
-		switch (sb.st_mode & S_IFMT) {
-		case S_IFDIR:
+		if (stat(solib->name, &sb) == 0 && S_ISDIR(sb.st_mode)) {
 			if (eal_plugindir_init(solib->name) == -1) {
 				RTE_LOG(ERR, EAL,
 					"Cannot init plugin directory %s\n",
 					solib->name);
 				return -1;
 			}
-			break;
-		case S_IFREG:
+		} else {
 			RTE_LOG(DEBUG, EAL, "open shared lib %s\n",
 				solib->name);
 			solib->lib_handle = dlopen(solib->name, RTLD_NOW);
@@ -239,7 +232,6 @@ eal_plugins_init(void)
 				RTE_LOG(ERR, EAL, "%s\n", dlerror());
 				return -1;
 			}
-			break;
 		}
 
 	}