Load plugin libraries safely (#14034)

For security purposes load plugin libraries only by absolute path to prevent
search from environment variables, working directory etc.
This commit is contained in:
Vitaliy Urusovskij 2022-11-22 12:44:56 +04:00 committed by GitHub
parent 1910f42179
commit 97878dee34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 51 additions and 1 deletions

View File

@ -33,6 +33,9 @@ add_library(${TARGET_NAME} STATIC ${LIBRARY_SRC} ${PUBLIC_HEADERS})
add_library(openvino::util ALIAS ${TARGET_NAME}) add_library(openvino::util ALIAS ${TARGET_NAME})
target_link_libraries(${TARGET_NAME} PRIVATE ${CMAKE_DL_LIBS}) target_link_libraries(${TARGET_NAME} PRIVATE ${CMAKE_DL_LIBS})
if (WIN32)
target_link_libraries(${TARGET_NAME} PRIVATE Shlwapi)
endif()
target_include_directories(${TARGET_NAME} PUBLIC target_include_directories(${TARGET_NAME} PUBLIC
$<BUILD_INTERFACE:${UTIL_INCLUDE_DIR}>) $<BUILD_INTERFACE:${UTIL_INCLUDE_DIR}>)

View File

@ -23,6 +23,15 @@ namespace util {
*/ */
std::shared_ptr<void> load_shared_object(const char* path); std::shared_ptr<void> load_shared_object(const char* path);
/**
* @brief Loads a library with absolute path specified.
* Prevents library search in working directory, environment
* variables etc.
* @param path Full path to the plugin library
* @return Reference to shared object
*/
std::shared_ptr<void> load_shared_object_safely(const char* path);
#ifdef OPENVINO_ENABLE_UNICODE_PATH_SUPPORT #ifdef OPENVINO_ENABLE_UNICODE_PATH_SUPPORT
/** /**
* @brief Loads a library with the wide char name specified. * @brief Loads a library with the wide char name specified.
@ -30,6 +39,15 @@ std::shared_ptr<void> load_shared_object(const char* path);
* @return Reference to shared object * @return Reference to shared object
*/ */
std::shared_ptr<void> load_shared_object(const wchar_t* path); std::shared_ptr<void> load_shared_object(const wchar_t* path);
/**
* @brief Loads a library with wide char absolute path specified.
* Prevents library search in working directory, environment
* variables etc.
* @param path Full path to the plugin library
* @return Reference to shared object
*/
std::shared_ptr<void> load_shared_object_safely(const wchar_t* path);
#endif // OPENVINO_ENABLE_UNICODE_PATH_SUPPORT #endif // OPENVINO_ENABLE_UNICODE_PATH_SUPPORT
/** /**
* @brief Searches for a function symbol in the loaded module * @brief Searches for a function symbol in the loaded module

View File

@ -12,6 +12,14 @@
namespace ov { namespace ov {
namespace util { namespace util {
std::shared_ptr<void> load_shared_object_safely(const char* path) {
if (path == nullptr)
throw std::runtime_error("Cannot load library: path isn't specified.");
if (path[0] == '/')
return load_shared_object(path);
throw std::runtime_error("Cannot load library: path '" + static_cast<std::string>(path) + "' is not absolute.");
}
std::shared_ptr<void> load_shared_object(const char* path) { std::shared_ptr<void> load_shared_object(const char* path) {
auto shared_object = std::shared_ptr<void>{dlopen(path, RTLD_NOW), [](void* shared_object) { auto shared_object = std::shared_ptr<void>{dlopen(path, RTLD_NOW), [](void* shared_object) {
if (shared_object != nullptr) { if (shared_object != nullptr) {
@ -36,6 +44,10 @@ std::shared_ptr<void> load_shared_object(const char* path) {
} }
#ifdef OPENVINO_ENABLE_UNICODE_PATH_SUPPORT #ifdef OPENVINO_ENABLE_UNICODE_PATH_SUPPORT
std::shared_ptr<void> load_shared_object_safely(const wchar_t* path) {
return load_shared_object_safely(ov::util::wstring_to_string(path).c_str());
}
std::shared_ptr<void> load_shared_object(const wchar_t* path) { std::shared_ptr<void> load_shared_object(const wchar_t* path) {
return load_shared_object(ov::util::wstring_to_string(path).c_str()); return load_shared_object(ov::util::wstring_to_string(path).c_str());
} }

View File

@ -70,9 +70,18 @@
#endif #endif
#include <windows.h> #include <windows.h>
#include <Shlwapi.h>
namespace ov { namespace ov {
namespace util { namespace util {
std::shared_ptr<void> load_shared_object_safely(const char* path) {
if (path == nullptr)
throw std::runtime_error("Cannot load library: path isn't specified.");
if (!PathIsRelativeA(path))
return load_shared_object(path);
throw std::runtime_error("Cannot load library: path '" + static_cast<std::string>(path) + "' is not absolute.");
}
std::shared_ptr<void> load_shared_object(const char* path) { std::shared_ptr<void> load_shared_object(const char* path) {
void* shared_object = nullptr; void* shared_object = nullptr;
using GetDllDirectoryA_Fnc = DWORD (*)(DWORD, LPSTR); using GetDllDirectoryA_Fnc = DWORD (*)(DWORD, LPSTR);
@ -124,6 +133,14 @@ std::shared_ptr<void> load_shared_object(const char* path) {
} }
#ifdef OPENVINO_ENABLE_UNICODE_PATH_SUPPORT #ifdef OPENVINO_ENABLE_UNICODE_PATH_SUPPORT
std::shared_ptr<void> load_shared_object_safely(const wchar_t* path) {
if (path == nullptr)
throw std::runtime_error("Cannot load library: path isn't specified.");
if (!PathIsRelativeW(path))
return load_shared_object(path);
throw std::runtime_error("Cannot load library: path '" + ov::util::wstring_to_string(std::wstring(path)) + "' is not absolute.");
}
std::shared_ptr<void> load_shared_object(const wchar_t* path) { std::shared_ptr<void> load_shared_object(const wchar_t* path) {
void* shared_object = nullptr; void* shared_object = nullptr;
using GetDllDirectoryW_Fnc = DWORD (*)(DWORD, LPWSTR); using GetDllDirectoryW_Fnc = DWORD (*)(DWORD, LPWSTR);

View File

@ -1161,7 +1161,7 @@ public:
desc.pluginCreateFunc(plugin_impl); desc.pluginCreateFunc(plugin_impl);
plugin = InferencePlugin{plugin_impl, {}}; plugin = InferencePlugin{plugin_impl, {}};
} else { } else {
so = ov::util::load_shared_object(desc.libraryLocation.c_str()); so = ov::util::load_shared_object_safely(desc.libraryLocation.c_str());
std::shared_ptr<ie::IInferencePlugin> plugin_impl; std::shared_ptr<ie::IInferencePlugin> plugin_impl;
reinterpret_cast<InferenceEngine::CreatePluginEngineFunc*>( reinterpret_cast<InferenceEngine::CreatePluginEngineFunc*>(
ov::util::get_symbol(so, InferenceEngine::create_plugin_function))(plugin_impl); ov::util::get_symbol(so, InferenceEngine::create_plugin_function))(plugin_impl);