[v9_10] wrong dlopen filename caused segfault

3878.	[bug]		Using the incorrect filename for a DLZ module
			caused a segmentation fault on startup. [RT #36286]

(cherry picked from commit c1d33c159bf81d6faf9948ac9a6f307ca52284af)

diff --git a/CHANGES b/CHANGES
index 2b448a335577980ded4a340b212d709d7a1ce150..542abb071e9e4f249bd2162f2b5089ae4a0d50f4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3878.  [bug]           Using the incorrect filename for a DLZ module
+                       caused a segmentation fault on startup. [RT #36286]
+
 3877.  [bug]           Inserting and deleting parent and child nodes
                        in response policy zones could trigger an assertion
                        failure. [RT #36272]

diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c
index 28cc3ef8953c01bbec8a141c89cfb63e5daf6890..378327245fb9a19542963e99c29c89745d2278a3 100644 (file)
--- a/bin/named/unix/dlz_dlopen_driver.c
+++ b/bin/named/unix/dlz_dlopen_driver.c
@@ -245,11 +245,13 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
 
        cd->dl_path = isc_mem_strdup(cd->mctx, argv[1]);
        if (cd->dl_path == NULL) {
+               result = ISC_R_NOMEMORY;
                goto failed;
        }
 
        cd->dlzname = isc_mem_strdup(cd->mctx, dlzname);
        if (cd->dlzname == NULL) {
+               result = ISC_R_NOMEMORY;
                goto failed;
        }
 
@@ -279,6 +281,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
                dlopen_log(ISC_LOG_ERROR,
                           "dlz_dlopen failed to open library '%s' - %s",
                           cd->dl_path, dlerror());
+               result = ISC_R_FAILURE;
                goto failed;
        }
 
@@ -298,6 +301,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
            cd->dlz_findzonedb == NULL)
        {
                /* We're missing a required symbol */
+               result = ISC_R_FAILURE;
                goto failed;
        }
 
@@ -379,7 +383,6 @@ failed:
        return (result);
 }
 
-
 /*
  * Called when bind is shutting down
  */

diff --git a/bin/named/win32/dlz_dlopen_driver.c b/bin/named/win32/dlz_dlopen_driver.c
index b6ba3a397cb492523a1cb0000e7b049689fd96ea..a12e9166612885cf6bbf2872f812a5a1c47cb102 100644 (file)
--- a/bin/named/win32/dlz_dlopen_driver.c
+++ b/bin/named/win32/dlz_dlopen_driver.c
@@ -244,11 +244,13 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
 
        cd->dl_path = isc_mem_strdup(cd->mctx, argv[1]);
        if (cd->dl_path == NULL) {
+               result = ISC_R_NOMEMORY;
                goto failed;
        }
 
        cd->dlzname = isc_mem_strdup(cd->mctx, dlzname);
        if (cd->dlzname == NULL) {
+               result = ISC_R_NOMEMORY;
                goto failed;
        }
 
@@ -265,6 +267,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
                dlopen_log(ISC_LOG_ERROR,
                           "dlz_dlopen failed to open library '%s' - %u",
                           cd->dl_path, error);
+               result = ISC_R_FAILURE;
                goto failed;
        }
 
@@ -284,6 +287,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
            cd->dlz_findzonedb == NULL)
        {
                /* We're missing a required symbol */
+               result = ISC_R_FAILURE;
                goto failed;
        }