From f449f278dd3c70e479a035f50a9bb817a9b433ba Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 17:24:08 +0200 Subject: Adding upstream version 3.2.6. Signed-off-by: Daniel Baumann --- tests-fuzz/knotd_wrap/afl-loop.h | 21 +++++++ tests-fuzz/knotd_wrap/server.c | 29 +++++++++ tests-fuzz/knotd_wrap/tcp-handler.c | 25 ++++++++ tests-fuzz/knotd_wrap/udp-handler.c | 116 ++++++++++++++++++++++++++++++++++++ 4 files changed, 191 insertions(+) create mode 100644 tests-fuzz/knotd_wrap/afl-loop.h create mode 100644 tests-fuzz/knotd_wrap/server.c create mode 100644 tests-fuzz/knotd_wrap/tcp-handler.c create mode 100644 tests-fuzz/knotd_wrap/udp-handler.c (limited to 'tests-fuzz/knotd_wrap') diff --git a/tests-fuzz/knotd_wrap/afl-loop.h b/tests-fuzz/knotd_wrap/afl-loop.h new file mode 100644 index 0000000..87ae9c3 --- /dev/null +++ b/tests-fuzz/knotd_wrap/afl-loop.h @@ -0,0 +1,21 @@ +/* Copyright (C) 2018 CZ.NIC, z.s.p.o. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + */ + +#pragma once + +#ifndef __AFL_LOOP +#define __AFL_LOOP(x) (0) +#endif diff --git a/tests-fuzz/knotd_wrap/server.c b/tests-fuzz/knotd_wrap/server.c new file mode 100644 index 0000000..fc37fbc --- /dev/null +++ b/tests-fuzz/knotd_wrap/server.c @@ -0,0 +1,29 @@ +/* Copyright (C) 2021 CZ.NIC, z.s.p.o. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + */ + +#define server_reconfigure orig_server_reconfigure +#include "knot/server/server.c" +#undef server_reconfigure + +extern void udp_master_init_stdio(server_t *server); + +int server_reconfigure(conf_t *conf, server_t *server) +{ + orig_server_reconfigure(conf, server); + udp_master_init_stdio(server); + + return KNOT_EOK; +} diff --git a/tests-fuzz/knotd_wrap/tcp-handler.c b/tests-fuzz/knotd_wrap/tcp-handler.c new file mode 100644 index 0000000..59b13fb --- /dev/null +++ b/tests-fuzz/knotd_wrap/tcp-handler.c @@ -0,0 +1,25 @@ +/* Copyright (C) 2018 CZ.NIC, z.s.p.o. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + */ + +#define tcp_master orig_tcp_master +#include "knot/server/tcp-handler.c" +#undef tcp_master + +int tcp_master(dthread_t *thread) +{ + log_info("AFL, empty TCP handler"); + return 0; +} diff --git a/tests-fuzz/knotd_wrap/udp-handler.c b/tests-fuzz/knotd_wrap/udp-handler.c new file mode 100644 index 0000000..cdd8727 --- /dev/null +++ b/tests-fuzz/knotd_wrap/udp-handler.c @@ -0,0 +1,116 @@ +/* Copyright (C) 2022 CZ.NIC, z.s.p.o. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + */ + +#include + +#include "knot/server/udp-handler.c" +#include "knot/common/log.h" + +typedef struct { + struct iovec iov[NBUFS]; + uint8_t buf[NBUFS][KNOT_WIRE_MAX_PKTSIZE]; + struct sockaddr_storage addr; + bool afl_persistent; +} udp_stdin_t; + +static inline void next(udp_stdin_t *rq) +{ + if (rq->afl_persistent) { + raise(SIGSTOP); + } else { + exit(0); + } +} + +static void *udp_stdin_init(_unused_ udp_context_t *ctx, _unused_ void *xdp_sock) +{ + udp_stdin_t *rq = calloc(1, sizeof(udp_stdin_t)); + if (rq == NULL) { + return NULL; + } + + for (unsigned i = 0; i < NBUFS; ++i) { + rq->iov[i].iov_base = rq->buf[i]; + rq->iov[i].iov_len = KNOT_WIRE_MAX_PKTSIZE; + } + + struct sockaddr_in *a = (struct sockaddr_in *)&rq->addr; + a->sin_family = AF_INET; + a->sin_addr.s_addr = IN_LOOPBACKNET; + a->sin_port = 42; + + rq->afl_persistent = getenv("AFL_PERSISTENT") != NULL; + + return rq; +} + +static void udp_stdin_deinit(void *d) +{ + free(d); +} + +static int udp_stdin_recv(_unused_ int fd, void *d) +{ + udp_stdin_t *rq = (udp_stdin_t *)d; + rq->iov[RX].iov_len = fread(rq->iov[RX].iov_base, 1, + KNOT_WIRE_MAX_PKTSIZE, stdin); + if (rq->iov[RX].iov_len == 0) { + next(rq); + } + + return rq->iov[RX].iov_len; +} + +static void udp_stdin_handle(udp_context_t *ctx, void *d) +{ + udp_stdin_t *rq = (udp_stdin_t *)d; + udp_handle(ctx, STDIN_FILENO, &rq->addr, &rq->iov[RX], &rq->iov[TX], false); +} + +static void udp_stdin_send(void *d) +{ + udp_stdin_t *rq = (udp_stdin_t *)d; + next(rq); +} + +static udp_api_t stdin_api = { + udp_stdin_init, + udp_stdin_deinit, + udp_stdin_recv, + udp_stdin_handle, + udp_stdin_send +}; + +void udp_master_init_stdio(server_t *server) { + + log_info("AFL, UDP handler listening on stdin"); + + // Register dummy interface to server. + iface_t *ifc = calloc(1, sizeof(*ifc)); + assert(ifc); + ifc->fd_udp = calloc(1, sizeof(*ifc->fd_udp)); + assert(ifc->fd_udp); + ifc->fd_udp[0] = STDIN_FILENO; + ifc->fd_udp_count = 1; + + server->n_ifaces = 1; + server->ifaces = ifc; + + udp_recvfrom_api = stdin_api; +#ifdef ENABLE_RECVMMSG + udp_recvmmsg_api = stdin_api; +#endif +} -- cgit v1.2.3