fuzz-ndisc-rs: use ASSERT_OK() and friends

Replace assert_se() with the typed ASSERT_* macros, so that a failing
assertion logs the values involved.
This commit is contained in:
Yu Watanabe committed 2026-11-05 03:21:37 +09:00
1 parent 9c9c6ce545
commit 01cc22e103
1 file changed
+21 -20
+21 -20
View File
@@ -13,6 +13,7 @@
#include "icmp6-util.h"
#include "ndisc-option.h"
#include "set.h"
#include "tests.h"
static void test_with_sd_ndisc(const uint8_t *data, size_t size) {
struct ether_addr mac_addr = {
@@ -21,15 +22,15 @@ static void test_with_sd_ndisc(const uint8_t *data, size_t size) {
_cleanup_(sd_event_unrefp) sd_event *e = NULL;
_cleanup_(sd_ndisc_unrefp) sd_ndisc *nd = NULL;
assert_se(sd_event_new(&e) >= 0);
assert_se(sd_ndisc_new(&nd) >= 0);
assert_se(sd_ndisc_attach_event(nd, e, /* priority= */ 0) >= 0);
assert_se(sd_ndisc_set_ifindex(nd, 42) >= 0);
assert_se(sd_ndisc_set_mac(nd, &mac_addr) >= 0);
assert_se(sd_ndisc_start(nd) >= 0);
assert_se(write(test_fd[1], data, size) == (ssize_t) size);
ASSERT_OK(sd_event_new(&e));
ASSERT_OK(sd_ndisc_new(&nd));
ASSERT_OK(sd_ndisc_attach_event(nd, e, /* priority= */ 0));
ASSERT_OK(sd_ndisc_set_ifindex(nd, 42));
ASSERT_OK(sd_ndisc_set_mac(nd, &mac_addr));
ASSERT_OK(sd_ndisc_start(nd));
ASSERT_EQ(write(test_fd[1], data, size), (ssize_t) size);
(void) sd_event_run(e, UINT64_MAX);
assert_se(sd_ndisc_stop(nd) >= 0);
ASSERT_OK(sd_ndisc_stop(nd));
test_fd[1] = safe_close(test_fd[1]);
TAKE_FD(test_fd[0]); /* It should be already closed by sd_ndisc_stop(). */
}
@@ -41,17 +42,17 @@ static void test_with_sd_radv(const uint8_t *data, size_t size) {
_cleanup_(sd_event_unrefp) sd_event *e = NULL;
_cleanup_(sd_radv_unrefp) sd_radv *ra = NULL;
assert_se(socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC | SOCK_NONBLOCK, 0, test_fd) >= 0);
ASSERT_OK(socketpair(AF_UNIX, SOCK_SEQPACKET | SOCK_CLOEXEC | SOCK_NONBLOCK, 0, test_fd));
assert_se(sd_event_new(&e) >= 0);
assert_se(sd_radv_new(&ra) >= 0);
assert_se(sd_radv_attach_event(ra, e, /* priority= */ 0) >= 0);
assert_se(sd_radv_set_ifindex(ra, 42) >= 0);
assert_se(sd_radv_set_mac(ra, &mac_addr) >= 0);
assert_se(sd_radv_start(ra) >= 0);
assert_se(write(test_fd[0], data, size) == (ssize_t) size);
ASSERT_OK(sd_event_new(&e));
ASSERT_OK(sd_radv_new(&ra));
ASSERT_OK(sd_radv_attach_event(ra, e, /* priority= */ 0));
ASSERT_OK(sd_radv_set_ifindex(ra, 42));
ASSERT_OK(sd_radv_set_mac(ra, &mac_addr));
ASSERT_OK(sd_radv_start(ra));
ASSERT_EQ(write(test_fd[0], data, size), (ssize_t) size);
(void) sd_event_run(e, UINT64_MAX);
assert_se(sd_radv_stop(ra) >= 0);
ASSERT_OK(sd_radv_stop(ra));
test_fd[0] = safe_close(test_fd[0]);
TAKE_FD(test_fd[1]); /* It should be already closed by sd_radv_stop(). */
}
@@ -61,8 +62,8 @@ static void test_with_icmp6_packet(const uint8_t *data, size_t size) {
_cleanup_(icmp6_packet_unrefp) ICMP6Packet *packet = NULL;
_cleanup_set_free_ Set *options = NULL;
assert_se(socketpair(AF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0, fd_pair) >= 0);
assert_se(write(fd_pair[1], data, size) == (ssize_t) size);
ASSERT_OK(socketpair(AF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0, fd_pair));
ASSERT_EQ(write(fd_pair[1], data, size), (ssize_t) size);
if (icmp6_packet_receive(fd_pair[0], &packet) < 0)
return;
@@ -80,7 +81,7 @@ static void test_with_icmp6_packet(const uint8_t *data, size_t size) {
if (icmp6_packet_receive(fd_pair[0], &packet) < 0)
return;
assert_se(ndisc_parse_options(packet, &options) >= 0);
ASSERT_OK(ndisc_parse_options(packet, &options));
}
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {