-
Notifications
You must be signed in to change notification settings - Fork 512
/
bind-9.17.6.patch
361 lines (353 loc) · 8.83 KB
/
bind-9.17.6.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
diff -Nur ORIG.bind-9.17.6/bin/named/fuzz.c bind-9.17.6/bin/named/fuzz.c
--- ORIG.bind-9.17.6/bin/named/fuzz.c 2020-10-12 13:10:30.613939002 +0200
+++ bind-9.17.6/bin/named/fuzz.c 2020-11-17 18:11:46.804682813 +0100
@@ -14,7 +14,7 @@
#include <named/fuzz.h>
-#ifdef ENABLE_AFL
+#if 0
#include <arpa/inet.h>
#include <errno.h>
#include <pthread.h>
@@ -728,7 +728,7 @@
*/
void
named_fuzz_notify(void) {
-#ifdef ENABLE_AFL
+#if 0
if (getenv("AFL_CMIN")) {
named_server_flushonshutdown(named_g_server, false);
isc_app_shutdown();
@@ -748,7 +748,7 @@
void
named_fuzz_setup(void) {
-#ifdef ENABLE_AFL
+#if 0
if (getenv("__AFL_PERSISTENT") || getenv("AFL_CMIN")) {
pthread_t thread;
void *(fn) = NULL;
diff -Nur ORIG.bind-9.17.6/bin/named/main.c bind-9.17.6/bin/named/main.c
--- ORIG.bind-9.17.6/bin/named/main.c 2020-10-12 13:10:30.613939002 +0200
+++ bind-9.17.6/bin/named/main.c 2020-11-17 18:12:03.670951918 +0100
@@ -1422,9 +1422,260 @@
#endif /* HAVE_LIBSCF */
/* main entry point, possibly hooked */
+#include <arpa/inet.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <libhfcommon/util.h>
+#include <libhfuzz/libhfuzz.h>
+#include <named/globals.h>
+#include <net/if.h>
+#include <net/route.h>
+#include <netinet/ip6.h>
+#include <netinet/tcp.h>
+#include <pthread.h>
+#include <sched.h>
+#include <sys/ioctl.h>
+#include <sys/random.h>
+#include <sys/resource.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/uio.h>
+#include <sys/wait.h>
+#include <unistd.h>
+
+static void enter_namespaces(void) {
+ if (linuxEnterNs(CLONE_NEWUSER | CLONE_NEWNET | CLONE_NEWNS | CLONE_NEWIPC) == false) {
+ exit(1);
+ }
+ if (linuxIfaceUp("lo") == false) {
+ exit(1);
+ }
+ if (linuxMountTmpfs("/tmp", "size=10000000") == false) {
+ exit(1);
+ }
+}
+
+static size_t rlen = 0;
+static const uint8_t *rbuf = NULL;
+
+__attribute__((no_sanitize("memory"))) __attribute__((no_sanitize("address"))) static void *
+bind_thr(void *unused __attribute__((unused))) {
+ while (!named_g_run_done) {
+ usleep(300000);
+ }
+
+ if (named_g_fuzz_type != isc_fuzz_resolver) {
+ for (;;) {
+ pause();
+ }
+ }
+
+ int myfd = socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
+ if (myfd == -1) {
+ perror("socket");
+ exit(1);
+ }
+ int val = 1;
+ if (setsockopt(myfd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) == -1) {
+ perror("setsockopt(SO_REUSEADDR)");
+ }
+
+ const struct sockaddr_in saddr = {
+ .sin_family = AF_INET,
+ .sin_port = htons(5353),
+ .sin_addr.s_addr = inet_addr("127.0.0.2"),
+ };
+ if (bind(myfd, &saddr, sizeof(saddr)) == -1) {
+ perror("bind");
+ exit(1);
+ }
+
+ if (listen(myfd, SOMAXCONN) == -1) {
+ perror("listen");
+ exit(1);
+ }
+
+ for (;;) {
+ struct sockaddr_in cli;
+ socklen_t cli_len = sizeof(cli);
+
+ int nfd = TEMP_FAILURE_RETRY(accept(myfd, &cli, &cli_len));
+ if (nfd == -1) {
+ perror("accept");
+ exit(1);
+ }
+
+ static char b[1024 * 1024];
+ ssize_t sz = TEMP_FAILURE_RETRY(recv(nfd, b, sizeof(b), 0));
+ if (sz == -1) {
+ perror("recv");
+ _exit(1);
+ }
+ if (sz < 4) {
+ close(nfd);
+ continue;
+ }
+
+ HF_ITER(&rbuf, &rlen);
+
+ uint16_t t_l = htons(rlen + 2);
+ const struct iovec iov[] = {
+ {
+ .iov_base = &t_l,
+ .iov_len = sizeof(t_l),
+ },
+ {
+ .iov_base = &b[2],
+ .iov_len = 2,
+ },
+ {
+ .iov_base = rbuf,
+ .iov_len = rlen,
+ },
+ };
+
+ if (TEMP_FAILURE_RETRY(writev(nfd, iov, 3)) == -1) {
+ perror("writev() failed 1");
+ }
+
+ close(nfd);
+ }
+
+ return NULL;
+}
+
+static void rndloop(int sock) {
+ const struct sockaddr_in bsaddr = {
+ .sin_family = AF_INET,
+ .sin_port = htons(0),
+ .sin_addr.s_addr = htonl((((uint32_t)util_rnd64()) & 0x00FFFFFF) | 0x7F000000),
+ };
+ if (TEMP_FAILURE_RETRY(bind(sock, (const struct sockaddr *)&bsaddr, sizeof(bsaddr))) ==
+ -1) {
+ perror("bind");
+ }
+}
+
+__attribute__((no_sanitize("memory"))) __attribute__((no_sanitize("address"))) static void *
+connect_thr(void *unused __attribute__((unused))) {
+ while (!named_g_run_done) {
+ usleep(300000);
+ }
+
+ for (;;) {
+ int myfd = socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
+ if (myfd == -1) {
+ perror("socket");
+ exit(1);
+ }
+ int val = 1;
+ if (setsockopt(myfd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val)) == -1) {
+ perror("setsockopt(SO_REUSEADDR)");
+ }
+
+ rndloop(myfd);
+
+ const struct sockaddr_in saddr = {
+ .sin_family = AF_INET,
+ .sin_port = htons(53),
+ .sin_addr.s_addr = htonl(INADDR_LOOPBACK),
+ };
+ if (TEMP_FAILURE_RETRY(connect(myfd, &saddr, sizeof(saddr))) == -1) {
+ close(myfd);
+ continue;
+ }
+
+ const uint8_t *buf;
+ size_t len;
+
+ if (named_g_fuzz_type == isc_fuzz_client) {
+ HF_ITER(&buf, &len);
+ } else {
+ static uint8_t qbuf[] = {0x88, 0x0c, 0x01, 0x20, 0x00, 0x01, 0x00, 0x00,
+ 0x00, 0x00, 0x00, 0x01, 0x0a, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61, 0x61,
+ 0x61, 0x61, 0x61, 0x07, 0x65, 0x78, 0x61, 0x6d, 0x70, 0x6c, 0x65, 0x00,
+ 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x29, 0x10, 0x00, 0x00, 0x00, 0x80,
+ 0x00, 0x00, 0x00};
+
+ /* Randomize the query */
+ uint64_t rnd;
+ getrandom(&rnd, sizeof(rnd), 0);
+ char tstr[32];
+ snprintf(tstr, sizeof(tstr), "%09llx", rnd);
+ memcpy(&qbuf[14], tstr, 9);
+
+ buf = qbuf;
+ len = sizeof(qbuf);
+ }
+
+ uint16_t t_l = htons(len);
+ const struct iovec iov[] = {
+ {
+ .iov_base = &t_l,
+ .iov_len = sizeof(t_l),
+ },
+ {
+ .iov_base = (void *)buf,
+ .iov_len = len,
+ },
+ };
+
+ if (TEMP_FAILURE_RETRY(writev(myfd, iov, 2)) == -1) {
+ perror("write");
+ close(myfd);
+ continue;
+ }
+
+ if (shutdown(myfd, SHUT_WR) == -1) {
+ if (errno == ENOTCONN) {
+ close(myfd);
+ continue;
+ }
+ perror("shutdown");
+ _exit(1);
+ }
+
+ uint8_t b[1024 * 512];
+ while (TEMP_FAILURE_RETRY(recv(myfd, b, sizeof(b), 0)) > 0)
+ ;
+ close(myfd);
+ }
+}
+
+static void launch_thr(void) {
+ pthread_attr_t attr;
+ pthread_attr_init(&attr);
+ pthread_attr_setstacksize(&attr, 1024 * 1024 * 4);
+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+
+ pthread_t t;
+ if (pthread_create(&t, &attr, bind_thr, NULL) < 0) {
+ perror("pthread_create(bind_thr)");
+ exit(1);
+ }
+
+ pthread_attr_init(&attr);
+ pthread_attr_setstacksize(&attr, 1024 * 1024 * 4);
+ pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+ if (pthread_create(&t, &attr, connect_thr, NULL) < 0) {
+ perror("pthread_create(connect_thr)");
+ exit(1);
+ }
+}
+
+/* main entry point, possibly hooked */
+
+int main(int argc, char *argv[]) {
+ if (!getenv("NO_FUZZ")) {
+ named_g_fuzz_addr = "127.0.0.1:53";
+ named_g_fuzz_type = isc_fuzz_client;
+ enter_namespaces();
+ launch_thr();
+ }
+
-int
-main(int argc, char *argv[]) {
isc_result_t result;
#ifdef HAVE_LIBSCF
char *instance = NULL;
diff -Nur ORIG.bind-9.17.6/compile.sh bind-9.17.6/compile.sh
--- ORIG.bind-9.17.6/compile.sh 1970-01-01 01:00:00.000000000 +0100
+++ bind-9.17.6/compile.sh 2020-11-17 18:11:46.804682813 +0100
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -ex
+
+export CC="$HOME"/src/honggfuzz/hfuzz_cc/hfuzz-clang
+export CXX="$HOME"/src/honggfuzz/hfuzz_cc/hfuzz-clang++
+export CFLAGS="-fsanitize=address -Wno-shift-negative-value -Wno-logical-not-parentheses -g -ggdb -O3 -D__AFL_COMPILER"
+./configure \
+ --prefix="$HOME"/fuzz/bind/dist/ \
+ --without-gssapi \
+ --disable-chroot \
+ --disable-linux-caps \
+ --without-libtool \
+ --enable-fuzzing=afl \
+ --disable-backtrace \
+ --with-openssl=yes
+
+make clean
+make -j$(nproc)
diff -Nur ORIG.bind-9.17.6/lib/dns/request.c bind-9.17.6/lib/dns/request.c
--- ORIG.bind-9.17.6/lib/dns/request.c 2020-10-12 13:10:30.705938792 +0200
+++ bind-9.17.6/lib/dns/request.c 2020-11-17 18:11:46.804682813 +0100
@@ -754,7 +754,7 @@
goto cleanup;
}
- if ((options & DNS_REQUESTOPT_TCP) != 0 || r.length > 512) {
+ if ((options & DNS_REQUESTOPT_TCP) != 0 || r.length >= 0) {
tcp = true;
}
share = (options & DNS_REQUESTOPT_SHARE);
@@ -1050,6 +1050,8 @@
dns_compress_t cctx;
bool cleanup_cctx = false;
+ options |= DNS_REQUESTOPT_TCP;
+
REQUIRE(bufferp != NULL && *bufferp == NULL);
req_log(ISC_LOG_DEBUG(3), "request_render");
@@ -1106,7 +1108,7 @@
isc_buffer_usedregion(buf1, &r);
if ((options & DNS_REQUESTOPT_TCP) != 0) {
tcp = true;
- } else if (r.length > 512) {
+ } else if (r.length > 0) {
result = DNS_R_USETCP;
goto cleanup;
}
diff -Nur ORIG.bind-9.17.6/lib/dns/resolver.c bind-9.17.6/lib/dns/resolver.c
--- ORIG.bind-9.17.6/lib/dns/resolver.c 2020-10-12 13:10:30.705938792 +0200
+++ bind-9.17.6/lib/dns/resolver.c 2020-11-17 18:11:46.806682845 +0100
@@ -2027,7 +2027,7 @@
dns_message_create(fctx->mctx, DNS_MESSAGE_INTENTPARSE,
&query->rmessage);
query->mctx = fctx->mctx;
- query->options = options;
+ query->options = options | DNS_FETCHOPT_TCP;
query->attributes = 0;
query->sends = 0;
query->connects = 0;