You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
66 lines
2.4 KiB
66 lines
2.4 KiB
From 062b04898be720ed0855efc192847fcbc667b3e1 Mon Sep 17 00:00:00 2001 |
|
From: Mark Andrews <marka@isc.org> |
|
Date: Thu, 7 Jul 2016 12:52:47 +1000 |
|
Subject: [PATCH] 4406. [bug] getrrsetbyname with a non absolute |
|
name could trigger a infinite recursion bug in lwresd |
|
and named with lwres configured if when combined |
|
with a search list entry the resulting name is |
|
too long. [RT #42694] |
|
|
|
(cherry picked from commit 38cc2d14e218e536e0102fa70deef99461354232) |
|
--- |
|
bin/named/lwdgrbn.c | 16 ++++++++++------ |
|
bin/tests/system/lwresd/lwtest.c | 8 ++++++++ |
|
2 files changed, 18 insertions(+), 6 deletions(-) |
|
|
|
diff --git a/bin/named/lwdgrbn.c b/bin/named/lwdgrbn.c |
|
index 584ab25..37211eb 100644 |
|
--- a/bin/named/lwdgrbn.c |
|
+++ b/bin/named/lwdgrbn.c |
|
@@ -403,14 +403,18 @@ start_lookup(ns_lwdclient_t *client) { |
|
INSIST(client->lookup == NULL); |
|
|
|
dns_fixedname_init(&absname); |
|
- result = ns_lwsearchctx_current(&client->searchctx, |
|
- dns_fixedname_name(&absname)); |
|
+ |
|
/* |
|
- * This will return failure if relative name + suffix is too long. |
|
- * In this case, just go on to the next entry in the search path. |
|
+ * Perform search across all search domains until success |
|
+ * is returned. Return in case of failure. |
|
*/ |
|
- if (result != ISC_R_SUCCESS) |
|
- start_lookup(client); |
|
+ while (ns_lwsearchctx_current(&client->searchctx, |
|
+ dns_fixedname_name(&absname)) != ISC_R_SUCCESS) { |
|
+ if (ns_lwsearchctx_next(&client->searchctx) != ISC_R_SUCCESS) { |
|
+ ns_lwdclient_errorpktsend(client, LWRES_R_FAILURE); |
|
+ return; |
|
+ } |
|
+ } |
|
|
|
result = dns_lookup_create(cm->mctx, |
|
dns_fixedname_name(&absname), |
|
diff --git a/bin/tests/system/lwresd/lwtest.c b/bin/tests/system/lwresd/lwtest.c |
|
index 02647cb..c2be95d 100644 |
|
--- a/bin/tests/system/lwresd/lwtest.c |
|
+++ b/bin/tests/system/lwresd/lwtest.c |
|
@@ -768,6 +768,14 @@ main(void) { |
|
test_getrrsetbyname("e.example1.", 1, 46, 2, 0, 1); |
|
test_getrrsetbyname("", 1, 1, 0, 0, 0); |
|
|
|
+ test_getrrsetbyname("123456789.123456789.123456789.123456789." |
|
+ "123456789.123456789.123456789.123456789." |
|
+ "123456789.123456789.123456789.123456789." |
|
+ "123456789.123456789.123456789.123456789." |
|
+ "123456789.123456789.123456789.123456789." |
|
+ "123456789.123456789.123456789.123456789." |
|
+ "123456789", 1, 1, 0, 0, 0); |
|
+ |
|
if (fails == 0) |
|
printf("I:ok\n"); |
|
return (fails); |
|
-- |
|
2.7.4 |
|
|
|
|