WIP: import from bind-9.18

Makefile.in

@@ -14,7 +14,7 @@ top_builddir =  @top_builddir@
 
 VERSION=@BIND9_VERSION@
 
-SUBDIRS =	make lib bin doc
+SUBDIRS =	make lib bin fuzz doc
 TARGETS =
 PREREQS =	bind.keys.h
 

configure.ac

@@ -5507,6 +5507,7 @@ AC_CONFIG_FILES([
 	doc/xsl/isc-docbook-html.xsl
 	doc/xsl/isc-manpage.xsl
 	doc/xsl/isc-notes-html.xsl
+	fuzz/Makefile
 	isc-config.sh
 	lib/Makefile
 	lib/bind9/Makefile

fuzz/.gitignore

@@ -0,0 +1,4 @@
+/*.dSYM/
+dns_name_fromtext_target
+dns_rdata_fromwire_text
+/*.out/

fuzz/FUZZING.md

@@ -0,0 +1,37 @@
+<!--
+Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+
+SPDX-License-Identifier: MPL-2.0
+
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0.  If a copy of the MPL was not distributed with this
+file, you can obtain one at https://mozilla.org/MPL/2.0/.
+
+See the COPYRIGHT file distributed with this work for additional
+information regarding copyright ownership.
+-->
+
+= Fuzzing
+
+The tests in this directory can be operated in three modes:
+
+* non-fuzzing - the test just runs over all input located in `<test_name>.in/`
+  directory by compiling with mock main.c that walks through the directory and
+  runs `LLVMFuzzerTestOneInput()` over the input files
+* AFL - `./configure --with-fuzzing=afl` will either feed the stdin to
+  `LLVMFuzzerTestOneInput()` or run the `__AFL_LOOP(10000)` if compiled with
+  `afl-clang-fast`
+* LibFuzzer - `./configure --with-fuzzing=libfuzzer` will disable `main.c`
+  completely and it uses the standard LibFuzzer mechanims to feed
+  `LLVMFuzzerTestOneInput` with the fuzzer
+
+== Test Cases
+
+Each test case should be called descriptively and the executable target must
+link `testcase.o` and `main.o` and the `test_case.c` must have a function
+`LLVMFuzzerTestOneInput(const uint8_t* data, size_t size)`.
+
+== Adding more fuzzers
+
+To add a different fuzzer, `main.c` must be modified to include `main()` function
+for a specific fuzzer (or no function as is case with LibFuzzer).

fuzz/Makefile.in

@@ -0,0 +1,60 @@
+# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+#
+# SPDX-License-Identifier: MPL-2.0
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0.  If a copy of the MPL was not distributed with this
+# file, you can obtain one at https://mozilla.org/MPL/2.0/.
+#
+# See the COPYRIGHT file distributed with this work for additional
+# information regarding copyright ownership.
+
+srcdir =	@srcdir@
+VPATH =		@srcdir@
+top_srcdir =	@top_srcdir@
+abs_srcdir =	@abs_srcdir@
+
+@BIND9_MAKE_INCLUDES@
+
+CINCLUDES =	-I. -I.. ${DNS_INCLUDES} ${ISC_INCLUDES} \
+		${OPENSSL_CFLAGS}
+CDEFINES =	-DFUZZDIR=\"$(abs_srcdir)\"
+
+ISCLIBS =	../lib/isc/libisc.@A@
+ISCDEPLIBS =	../lib/isc/libisc.@A@
+DNSLIBS =	../lib/dns/libdns.@A@ ${MAXMINDDB_LIBS} @DNS_CRYPTO_LIBS@
+DNSDEPLIBS =	../lib/dns/libdns.@A@
+
+LIBS =		@LIBS@
+
+OBJS =		main.@O@
+SRCS =		main.c dns_message_parse.c dns_name_fromtext_target.c dns_rdata_fromwire_text.c
+
+SUBDIRS =
+TARGETS =	dns_message_parse@EXEEXT@ \
+		dns_name_fromtext_target@EXEEXT@ \
+		dns_rdata_fromwire_text@EXEEXT@
+
+@BIND9_MAKE_RULES@
+
+dns_message_parse@EXEEXT@: dns_message_parse.@O@ main.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
+		dns_message_parse.@O@ main.@O@ ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+dns_name_fromtext_target@EXEEXT@: dns_name_fromtext_target.@O@ main.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
+		dns_name_fromtext_target.@O@ main.@O@ ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+dns_rdata_fromwire_text@EXEEXT@: dns_rdata_fromwire_text.@O@ main.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
+	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
+		dns_rdata_fromwire_text.@O@ main.@O@ ${DNSLIBS} ${ISCLIBS} ${LIBS}
+
+check: ${TARGETS}
+	for fuzzer in ${TARGETS}; do \
+		./$${fuzzer} ; \
+	done
+
+oss-fuzz: ${TARGETS}
+
+clean distclean::
+	rm -f ${TARGETS}

fuzz/dns_message_parse.c

@@ -0,0 +1,190 @@
+/*
+ * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
+ *
+ * SPDX-License-Identifier: MPL-2.0
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, you can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See the COPYRIGHT file distributed with this work for additional
+ * information regarding copyright ownership.
+ */
+
+#include <inttypes.h>
+#include <stdbool.h>
+#include <stdlib.h>
+
+#include <isc/buffer.h>
+#include <isc/commandline.h>
+#include <isc/file.h>
+#include <isc/mem.h>
+#include <isc/print.h>
+#include <isc/result.h>
+#include <isc/string.h>
+#include <isc/util.h>
+
+#include <dns/message.h>
+#include <dns/result.h>
+
+#include "fuzz.h"
+
+bool debug = false;
+
+static isc_mem_t *mctx = NULL;
+static uint8_t *output = NULL;
+static size_t output_len = 1024;
+static uint8_t render_buf[64 * 1024 - 1];
+
+int
+LLVMFuzzerInitialize(int *argc __attribute__((unused)),
+		     char ***argv __attribute__((unused))) {
+	isc_mem_create(0, 0, &mctx);
+	output = isc_mem_get(mctx, output_len);
+
+	return (0);
+}
+
+static isc_result_t
+parse_message(isc_buffer_t *input, dns_message_t **messagep) {
+	isc_result_t result;
+	dns_message_t *message = NULL;
+
+	dns_message_create(mctx, DNS_MESSAGE_INTENTPARSE, &message);
+
+	result = dns_message_parse(message, input, DNS_MESSAGEPARSE_BESTEFFORT);
+	if (result == DNS_R_RECOVERABLE) {
+		result = ISC_R_SUCCESS;
+	}
+
+	if (result == ISC_R_SUCCESS && messagep != NULL) {
+		*messagep = message;
+	} else {
+		dns_message_detach(&message);
+	}
+
+	return (result);
+}
+
+static isc_result_t
+print_message(dns_message_t *message) {
+	isc_result_t result;
+	isc_buffer_t buffer;
+
+	do {
+		isc_buffer_init(&buffer, output, output_len);
+		result = dns_message_totext(message, &dns_master_style_debug, 0,
+					    &buffer);
+		if (result == ISC_R_NOSPACE) {
+			isc_mem_put(mctx, output, output_len);
+			output_len *= 2;
+			output = isc_mem_get(mctx, output_len);
+			continue;
+		}
+	} while (result == ISC_R_NOSPACE);
+
+	if (debug) {
+		fprintf(stderr, "%.*s\n", (int)isc_buffer_usedlength(&buffer),
+			output);
+	}
+
+	return (result);
+}
+
+#define CHECKRESULT(r, f)                 \
+	{                                 \
+		r = (f);                  \
+		if (r != ISC_R_SUCCESS) { \
+			goto cleanup;     \
+		}                         \
+	}
+
+static isc_result_t
+render_message(dns_message_t **messagep) {
+	isc_result_t result;
+	dns_message_t *message = *messagep;
+	isc_buffer_t buffer;
+	dns_compress_t cctx;
+
+	isc_buffer_init(&buffer, render_buf, sizeof(render_buf));
+
+	message->from_to_wire = DNS_MESSAGE_INTENTRENDER;
+	for (size_t i = 0; i < DNS_SECTION_MAX; i++) {
+		message->counts[i] = 0;
+	}
+
+	result = dns_compress_init(&cctx, -1, mctx);
+	if (result != ISC_R_SUCCESS) {
+		return (result);
+	}
+	CHECKRESULT(result, dns_message_renderbegin(message, &cctx, &buffer));
+
+	CHECKRESULT(result, dns_message_rendersection(message,
+						      DNS_SECTION_QUESTION, 0));
+
+	CHECKRESULT(result,
+		    dns_message_rendersection(message, DNS_SECTION_ANSWER, 0));
+	CHECKRESULT(result, dns_message_rendersection(
+				    message, DNS_SECTION_AUTHORITY, 0));
+
+	CHECKRESULT(result, dns_message_rendersection(
+				    message, DNS_SECTION_ADDITIONAL, 0));
+
+	dns_message_renderend(message);
+
+	dns_compress_invalidate(&cctx);
+
+	message->from_to_wire = DNS_MESSAGE_INTENTPARSE;
+
+	dns_message_detach(messagep);
+
+	result = parse_message(&buffer, messagep);
+
+	return (result);
+
+cleanup:
+	dns_compress_invalidate(&cctx);
+	return (result);
+}
+
+int
+LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
+	isc_buffer_t buffer;
+	isc_result_t result;
+	dns_message_t *message = NULL;
+
+	if (size > 65535) {
+		return (0);
+	}
+
+	isc_buffer_constinit(&buffer, data, size);
+	isc_buffer_add(&buffer, size);
+	isc_buffer_setactive(&buffer, size);
+
+	result = parse_message(&buffer, &message);
+	if (result != ISC_R_SUCCESS) {
+		goto cleanup;
+	}
+
+	result = print_message(message);
+	if (result != ISC_R_SUCCESS) {
+		goto cleanup;
+	}
+
+	result = render_message(&message);
+	if (result != ISC_R_SUCCESS) {
+		goto cleanup;
+	}
+
+	result = print_message(message);
+	if (result != ISC_R_SUCCESS) {
+		goto cleanup;
+	}
+
+cleanup:
+	if (message != NULL) {
+		dns_message_detach(&message);
+	}
+
+	return (0);
+}