Frontported CORE-3443: Races in UDF library lookup

src/jrd/flu.cpp

@@ -173,7 +173,7 @@ namespace Jrd
 	FPTR_INT Module::lookup(const char* module, const char* name, DatabaseModules& interest)
 	{
 		// Try to find loadable module
-		Module m = lookupModule(module, true);
+		Module m = lookupModule(module);
 		if (! m)
 		{
 			return 0;
@@ -193,24 +193,11 @@ namespace Jrd
 		return (FPTR_INT)rc;
 	}
 
-	FPTR_INT Module::lookup(const TEXT* module, const TEXT* name)
-	{
-		// Try to find loadable module
-		Module m = lookupModule(module, false);
-		if (! m)
-		{
-			return 0;
-		}
-
-		Firebird::string symbol;
-		terminate_at_space(symbol, name);
-		return (FPTR_INT)(m.lookupSymbol(symbol));
-	}
-
 	// flag 'udf' means pass name-path through UdfDirectoryList
-	Module Module::lookupModule(const char* name, bool udf)
+	Module Module::lookupModule(const char* name)
 	{
 		Firebird::MutexLockGuard lg(modulesMutex);
+
 		Firebird::PathName initialModule;
 		terminate_at_space(initialModule, name);
 
@@ -248,53 +235,37 @@ namespace Jrd
 				return Module(im);
 			}
 
-			if (udf)
+			// UdfAccess verification
+			Firebird::PathName path, relative;
+
+			// Search for module name in UdfAccess restricted
+			// paths list
+			PathUtils::splitLastComponent(path, relative, fixedModule);
+			if (path.length() == 0 && PathUtils::isRelative(fixedModule))
 			{
-				// UdfAccess verification
+				path = fixedModule;
-				Firebird::PathName path, relative;
+				if (! iUdfDirectoryList().expandFileName(fixedModule, path))
-
-				// Search for module name in UdfAccess restricted
-				// paths list
-				PathUtils::splitLastComponent(path, relative, fixedModule);
-				if (path.length() == 0 && PathUtils::isRelative(fixedModule))
 				{
-					path = fixedModule;
+					// relative path was used, but no appropriate file present
-					if (! iUdfDirectoryList().expandFileName(fixedModule, path))
+					continue;
-					{
-						// relative path was used, but no appropriate file present
-						continue;
-					}
-				}
-
-				// The module name, including directory path,
-				// must satisfy UdfAccess entry in config file.
-				if (! iUdfDirectoryList().isPathInList(fixedModule))
-				{
-					ERR_post(Arg::Gds(isc_conf_access_denied) << Arg::Str("UDF/BLOB-filter module") <<
-																 Arg::Str(initialModule));
-				}
-
-				ModuleLoader::Module* mlm = ModuleLoader::loadModule(fixedModule);
-				if (mlm)
-				{
-					im = FB_NEW(*getDefaultMemoryPool())
-						InternalModule(*getDefaultMemoryPool(), mlm, initialModule, fixedModule);
-					loadedModules().add(im);
-					return Module(im);
 				}
 			}
-			else
+
+			// The module name, including directory path,
+			// must satisfy UdfAccess entry in config file.
+			if (! iUdfDirectoryList().isPathInList(fixedModule))
 			{
-				// try to load permanent module
+				ERR_post(Arg::Gds(isc_conf_access_denied) << Arg::Str("UDF/BLOB-filter module") <<
-				ModuleLoader::Module* mlm = ModuleLoader::loadModule(fixedModule);
+															 Arg::Str(initialModule));
-				if (mlm)
+			}
-				{
+
-					im = FB_NEW(*getDefaultMemoryPool())
+			ModuleLoader::Module* mlm = ModuleLoader::loadModule(fixedModule);
-						InternalModule(*getDefaultMemoryPool(), mlm, initialModule, fixedModule);
+			if (mlm)
-					loadedModules().add(im);
+			{
-					im->acquire();	// make permanent
+				im = FB_NEW(*getDefaultMemoryPool())
-					return Module(im);
+					InternalModule(*getDefaultMemoryPool(), mlm, initialModule, fixedModule);
-				}
+				loadedModules().add(im);
+				return Module(im);
 			}
 		}
 
@@ -302,29 +273,22 @@ namespace Jrd
 		return Module();
 	}
 
-	Module::~Module()
+	Module::InternalModule::~InternalModule()
 	{
-		if (interMod)
+		delete handle;
+
+		Firebird::MutexLockGuard lg(modulesMutex);
+
+		for (size_t m = 0; m < loadedModules().getCount(); m++)
 		{
-			interMod->release();
+			if (loadedModules()[m] == this)
-			if (! interMod->inUse())
 			{
-				Firebird::MutexLockGuard lg(modulesMutex);
+				loadedModules().remove(m);
-				for (size_t m = 0; m < loadedModules().getCount(); m++)
+				return;
-				{
-					if (loadedModules()[m] == interMod)
-					{
-						loadedModules().remove(m);
-						delete interMod;
-						return;
-					}
-				}
-				fb_assert(false);
-				// In production server we delete interMod here
-				// (though this is not normal case)
-				delete interMod;
 			}
 		}
+
+		fb_assert(false);
 	}
 
 } // namespace Jrd

src/jrd/flu.h

@@ -31,20 +31,20 @@
 
 #include "../common/classes/objects_array.h"
 #include "../common/os/mod_loader.h"
+#include "../common/classes/RefCounted.h"
 
 namespace Jrd
 {
 	class Module
 	{
 	private:
-		class InternalModule
+		class InternalModule : public Firebird::RefCounted
 		{
 		private:
 			InternalModule(const InternalModule &im);
 			void operator=(const InternalModule &im);
 
 		public:
-			long useCount;
 			ModuleLoader::Module* handle;
 			Firebird::PathName originalName, loadName;
 
@@ -57,59 +57,30 @@ namespace Jrd
 				return handle->findSymbol(name);
 			}
 
-/*			explicit InternalModule(MemoryPool& p)
-				: useCount(0), handle(0),
-				originalName(p), loadName(p)
-			{ }
-*/
 			InternalModule(MemoryPool& p,
 						   ModuleLoader::Module* h,
 						   const Firebird::PathName& on,
 						   const Firebird::PathName& ln)
-				: useCount(0), handle(h),
+				: handle(h),
 					originalName(p, on), loadName(p, ln)
 			{ }
 
-			~InternalModule()
+			~InternalModule();
-			{
-				fb_assert(useCount == 0);
-				delete handle;
-			}
 
 			bool operator==(const Firebird::PathName &pn) const
 			{
 				return originalName == pn || loadName == pn;
 			}
 
-			bool inUse() const
-			{
-				return useCount > 0;
-			}
-
-			void acquire()
-			{
-				fb_assert(handle);
-				++useCount;
-			}
-
-			void release()
-			{
-				fb_assert(useCount > 0);
-				--useCount;
-			}
 		};
 
-		InternalModule* interMod;
+		Firebird::RefPtr<InternalModule> interMod;
 
-		Module(InternalModule* h) : interMod(h)
+		Module(InternalModule* h)
-		{
+			: interMod(h)
-			if (interMod)
+		{ }
-			{
-				interMod->acquire();
-			}
-		}
 
-		static Module lookupModule(const char*, bool);
+		static Module lookupModule(const char*);
 
 		static InternalModule* scanModule(const Firebird::PathName& name);
 
@@ -118,32 +89,21 @@ namespace Jrd
 
 		Module() : interMod(0) { }
 
-		explicit Module(MemoryPool&) : interMod(0) { }
+		explicit Module(MemoryPool&)
+			: interMod(NULL)
+		{ }
 
-		Module(MemoryPool&, const Module& m) : interMod(m.interMod)
+		Module(MemoryPool&, const Module& m)
-		{
+			: interMod(m.interMod)
-			if (interMod)
+		{ }
-			{
-				interMod->acquire();
-			}
-		}
 
-		Module(const Module& m) : interMod(m.interMod)
+		Module(const Module& m)
-		{
+			: interMod(m.interMod)
-			if (interMod)
+		{ }
-			{
-				interMod->acquire();
-			}
-		}
-
-		virtual ~Module();
 
 		// used for UDF/BLOB Filter
 		static FPTR_INT lookup(const char*, const char*, Firebird::SortedObjectsArray<Module>&);
 
-		// used in y-valve
-		static FPTR_INT lookup(const char*, const char*);
-
 		bool operator>(const Module &im) const;
 
 		void *lookupSymbol(const Firebird::string& name)