Fixed CORE-5474: 'Restrict UDF' is not effective, because fbudf.so is…

… dynamically linked against libc
FirebirdSQL · Feb 6, 2017 · 8b2a9cb · asfernandes · Feb 6, 2017 · hvlad
1 parent 8621118
commit 8b2a9cb
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/src/common/os/mod_loader.h b/src/common/os/mod_loader.h
@@ -70,23 +70,15 @@ class ModuleLoader
 		/// Destructor
 		virtual ~Module() {}
 
-#ifdef WIN_NT
 		const Firebird::PathName fileName;
-#endif
 
 	protected:
 		/// The constructor is protected so normal code can't allocate instances
 		/// of the class, but the class itself is still able to be subclassed.
-#ifdef WIN_NT
 		Module(MemoryPool& pool, const Firebird::PathName& aFileName)
 			: fileName(pool, aFileName)
 		{
 		}
-#else
-		Module()
-		{
-		}
-#endif
 
 	private:
 		/// Copy construction is not supported, hence the copy constructor is private

diff --git a/src/common/os/posix/mod_loader.cpp b/src/common/os/posix/mod_loader.cpp
@@ -28,6 +28,7 @@
 #include "firebird.h"
 #include "../common/os/mod_loader.h"
 #include "../common/os/os_utils.h"
+#include "../common/os/path_utils.h"
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -40,8 +41,9 @@
 class DlfcnModule : public ModuleLoader::Module
 {
 public:
-	DlfcnModule(void* m)
-		: module(m)
+	DlfcnModule(MemoryPool& pool, const Firebird::PathName& aFileName, void* m)
+		: ModuleLoader::Module(pool, aFileName),
+		  module(m)
 	{}
 
 	~DlfcnModule();
@@ -109,7 +111,7 @@ ModuleLoader::Module* ModuleLoader::loadModule(const Firebird::PathName& modPath
 	system(command.c_str());
 #endif
 
-	return FB_NEW_POOL(*getDefaultMemoryPool()) DlfcnModule(module);
+	return FB_NEW_POOL(*getDefaultMemoryPool()) DlfcnModule(*getDefaultMemoryPool(), modPath, module);
 }
 
 DlfcnModule::~DlfcnModule()
@@ -127,6 +129,18 @@ void* DlfcnModule::findSymbol(const Firebird::string& symName)
 
 		result = dlsym(module, newSym.c_str());
 	}
+
+#ifdef HAVE_DLADDR
+	if (!PathUtils::isRelative(fileName))
+	{
+		Dl_info info;
+		if (!dladdr(result, &info))
+			return NULL;
+		if (fileName != info.dli_fname)
+			return NULL;
+	}
+#endif
+
 	return result;
 }