summaryrefslogtreecommitdiffstats
path: root/bind-99-ISC-Bugs-35495.patch
diff options
context:
space:
mode:
authorTomas Hozza <thozza@redhat.com>2014-03-05 14:37:50 +0100
committerTomas Hozza <thozza@redhat.com>2014-03-05 14:43:00 +0100
commit230113feeee0790412a98e8e390dda3c871e0ec4 (patch)
tree2bd0920865e4f5a4785761beccf6ac4ce97ba53b /bind-99-ISC-Bugs-35495.patch
parent7ebf9a3e72d57bcf2e54a7a9df993f5ea721c641 (diff)
Fix two issues
- dlz_dlopen driver could return the wrong error leading to a segfault (#1052781) - Fix race condition when freeing fetch object (ISC-Bugs #35385) Signed-off-by: Tomas Hozza <thozza@redhat.com>
Diffstat (limited to 'bind-99-ISC-Bugs-35495.patch')
-rw-r--r--bind-99-ISC-Bugs-35495.patch38
1 files changed, 38 insertions, 0 deletions
diff --git a/bind-99-ISC-Bugs-35495.patch b/bind-99-ISC-Bugs-35495.patch
new file mode 100644
index 0000000..6b98e51
--- /dev/null
+++ b/bind-99-ISC-Bugs-35495.patch
@@ -0,0 +1,38 @@
+From 576f2f19067c0c974d1d39f92c51e5f3a08fc17f Mon Sep 17 00:00:00 2001
+From: Tomas Hozza <thozza@redhat.com>
+Date: Tue, 4 Mar 2014 16:34:21 +0100
+Subject: [PATCH] Return ISC_R_FAILURE if the API version check fails
+
+Signed-off-by: Tomas Hozza <thozza@redhat.com>
+---
+ bin/named/unix/dlz_dlopen_driver.c | 1 +
+ bin/named/win32/dlz_dlopen_driver.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/bin/named/unix/dlz_dlopen_driver.c b/bin/named/unix/dlz_dlopen_driver.c
+index 2ba8a02..62b6614 100644
+--- a/bin/named/unix/dlz_dlopen_driver.c
++++ b/bin/named/unix/dlz_dlopen_driver.c
+@@ -330,6 +330,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
+ "dlz_dlopen: incorrect version %d "
+ "should be %d in '%s'",
+ cd->version, DLZ_DLOPEN_VERSION, cd->dl_path);
++ result = ISC_R_FAILURE;
+ goto failed;
+ }
+
+diff --git a/bin/named/win32/dlz_dlopen_driver.c b/bin/named/win32/dlz_dlopen_driver.c
+index 0c192b4..62008c0 100644
+--- a/bin/named/win32/dlz_dlopen_driver.c
++++ b/bin/named/win32/dlz_dlopen_driver.c
+@@ -314,6 +314,7 @@ dlopen_dlz_create(const char *dlzname, unsigned int argc, char *argv[],
+ "dlz_dlopen: incorrect version %d "
+ "should be %d in '%s'",
+ cd->version, DLZ_DLOPEN_VERSION, cd->dl_path);
++ result = ISC_R_FAILURE;
+ goto failed;
+ }
+
+--
+1.8.5.3
+