mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 06:55:30 +00:00
Code Issues Releases Wiki Activity

3998. [bug] isc_radix_search was returning matches that were

Browse Source 
to precise. [RT #37680]
This commit is contained in:
Mark Andrews
2014-11-04 12:34:12 +11:00
parent 257d7508c8
commit b976c39c07
5 changed files with 109 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
3998. [bug] isc_radix_search was returning matches that were
to precise. [RT #37680]
3997. [protocol] Add OPENGPGKEY record. [RT# 37671]
3996. [bug] Address use after free on out of memory error in

4
lib/isc/include/isc/radix.h
View File

@@ -32,7 +32,7 @@
#ifndef _RADIX_H
#define _RADIX_H
#define NETADDR_TO_PREFIX_T(na,pt,bits,isecs) \
#define NETADDR_TO_PREFIX_T(na,pt,bits,is_ecs) \
do { \
memset(&(pt), 0, sizeof(pt)); \
if((na) != NULL) { \
@@ -48,7 +48,7 @@
(pt).family = AF_UNSPEC; \
(pt).bitlen = 0; \
} \
(pt).ecs = isecs; \
(pt).ecs = is_ecs; \
isc_refcount_init(&(pt).refcount, 0); \
} while(0)

3
lib/isc/radix.c
View File

@@ -280,6 +280,9 @@ isc_radix_search(isc_radix_tree_t *radix, isc_radix_node_t **target,
while (cnt-- > 0) {
node = stack[cnt];
if (prefix->bitlen < node->bit)
continue;
if (_comp_with_mask(isc_prefix_tochar(node->prefix),
isc_prefix_tochar(prefix),
node->prefix->bitlen))

8
lib/isc/tests/Makefile.in
View File

@@ -36,14 +36,14 @@ LIBS = @LIBS@ @ATFLIBS@
OBJS = isctest.@O@
SRCS = isctest.c taskpool_test.c socket_test.c hash_test.c \
lex_test.c random_test.c \
lex_test.c radix_test.c random_test.c \
sockaddr_test.c symtab_test.c task_test.c queue_test.c \
parse_test.c pool_test.c print_test.c regex_test.c \
socket_test.c safe_test.c time_test.c aes_test.c
SUBDIRS =
TARGETS = taskpool_test@EXEEXT@ socket_test@EXEEXT@ hash_test@EXEEXT@ \
lex_test@EXEEXT@ random_test@EXEEXT@ \
lex_test@EXEEXT@ radix_test@EXEEXT@ random_test@EXEEXT@ \
sockaddr_test@EXEEXT@ symtab_test@EXEEXT@ task_test@EXEEXT@ \
queue_test@EXEEXT@ parse_test@EXEEXT@ pool_test@EXEEXT@ \
print_test@EXEEXT@ regex_test@EXEEXT@ socket_test@EXEEXT@ \
@@ -75,6 +75,10 @@ queue_test@EXEEXT@: queue_test.@O@ isctest.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
queue_test.@O@ isctest.@O@ ${ISCLIBS} ${LIBS}
radix_test@EXEEXT@: radix_test.@O@ isctest.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
radix_test.@O@ isctest.@O@ ${ISCLIBS} ${LIBS}
random_test@EXEEXT@: random_test.@O@ isctest.@O@ ${ISCDEPLIBS}
${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
random_test.@O@ isctest.@O@ ${ISCLIBS} ${LIBS}

95
lib/isc/tests/radix_test.c Normal file
View File

@@ -0,0 +1,95 @@
/*
* Copyright (C) 2014 Internet Systems Consortium, Inc. ("ISC")
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
* THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
* REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
* AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
* INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
* LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
* OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
* PERFORMANCE OF THIS SOFTWARE.
*/
#include <config.h>
#include <isc/mem.h>
#include <isc/netaddr.h>
#include <isc/radix.h>
#include <isc/result.h>
#include <isc/util.h>
#include <atf-c.h>
#include <stdlib.h>
#include <stdint.h>
#include "isctest.h"
ATF_TC(isc_radix_search);
ATF_TC_HEAD(isc_radix_search, tc) {
atf_tc_set_md_var(tc, "descr", "test radix seaching");
}
ATF_TC_BODY(isc_radix_search, tc) {
isc_radix_tree_t *radix = NULL;
isc_radix_node_t *node;
isc_prefix_t prefix;
isc_result_t result;
struct in_addr in_addr;
isc_netaddr_t netaddr;
UNUSED(tc);
result = isc_test_begin(NULL, ISC_TRUE);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
result = isc_radix_create(mctx, &radix, 32);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
in_addr.s_addr = inet_addr("3.3.3.0");
isc_netaddr_fromin(&netaddr, &in_addr);
NETADDR_TO_PREFIX_T(&netaddr, prefix, 24, ISC_FALSE);
node = NULL;
result = isc_radix_insert(radix, &node, NULL, &prefix);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
node->data[0] = (void *)1;
isc_refcount_destroy(&prefix.refcount);
in_addr.s_addr = inet_addr("3.3.0.0");
isc_netaddr_fromin(&netaddr, &in_addr);
NETADDR_TO_PREFIX_T(&netaddr, prefix, 16, ISC_FALSE);
node = NULL;
result = isc_radix_insert(radix, &node, NULL, &prefix);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
node->data[0] = (void *)2;
isc_refcount_destroy(&prefix.refcount);
in_addr.s_addr = inet_addr("3.3.3.3");
isc_netaddr_fromin(&netaddr, &in_addr);
NETADDR_TO_PREFIX_T(&netaddr, prefix, 22, ISC_FALSE);
node = NULL;
result = isc_radix_search(radix, &node, &prefix);
ATF_REQUIRE_EQ(result, ISC_R_SUCCESS);
ATF_REQUIRE_EQ(node->data[0], (void *)2);
isc_refcount_destroy(&prefix.refcount);
isc_radix_destroy(radix, NULL);
isc_test_end();
}
/*
* Main
*/
ATF_TP_ADD_TCS(tp) {
ATF_TP_ADD_TC(tp, isc_radix_search);
return (atf_no_error());
}