Skip to content

More various fixes (F-*) #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gasbytes wants to merge 10 commits into
base: master
Choose a base branch
from
Open

More various fixes (F-*) #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b700877
add a tcp_time_wait branch in tcp_input that re-sends an ack on any
gasbytes Apr 29, 2026
7d92e8b
Gate request-side arp_store_neighbor in arp_recv on a matching arp_pe…
gasbytes Apr 29, 2026
60f7c31
Add test_syn_sent_rst_ack_seg_ack_bounds to pin RFC 9293 section 3.10…
gasbytes Apr 29, 2026
671d5ad
Reject buffers shorter than ETH_HEADER_LEN at the top of wolfIP_recv_…
gasbytes Apr 29, 2026
73fc1b1
add test_multicast_igmp_query_bad_checksum_dropped to pin the IGMP ch…
gasbytes Apr 29, 2026
95bc67b
Add a udp.len <= ip.len - IP_HEADER_LEN guard in udp_try_recv so an L…
gasbytes Apr 29, 2026
b203126
Replace the signed-int (... & 0xFF) << 24 reassembly in dns_callback'…
gasbytes Apr 29, 2026
2d6edbb
Add a martian + strict-RPF source filter to ip_recv's WOLFIP_ENABLE_F…
gasbytes Apr 30, 2026
1037af7
Add an if (!s) return -WOLFIP_EINVAL; guard to wolfIP_sock_socket so …
gasbytes Apr 30, 2026
ebeca1d
move WOLFIP_LOOPBACK_IP/WOLFIP_LOOPBACK_MASK outside of the loopback …
gasbytes Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/test/unit/unit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ Suite *wolf_suite(void)
tcase_add_test(tc_utils, test_filter_socket_event_proto_variants);
tcase_add_test(tc_utils, test_filter_setters_and_get_mask);
tcase_add_test(tc_utils, test_sock_socket_errors);
tcase_add_test(tc_utils, test_regression_sock_socket_null_wolfip_returns_einval);
tcase_add_test(tc_utils, test_sock_socket_udp_protocol_zero);
tcase_add_test(tc_utils, test_sock_socket_full_tables);
tcase_add_test(tc_utils, test_filter_mask_for_proto_variants);
Expand Down Expand Up @@ -220,6 +221,7 @@ Suite *wolf_suite(void)
tcase_add_test(tc_utils, test_accepted_socket_destroyed_on_synrcvd_rto_expiry);
tcase_add_test(tc_utils, test_tcp_send_syn_options_aligned_small_mtu);
tcase_add_test(tc_utils, test_syn_sent_bare_rst_dropped);
tcase_add_test(tc_utils, test_syn_sent_rst_ack_seg_ack_bounds);
tcase_add_test(tc_utils, test_syn_rcvd_rst_bad_seq_dropped);
tcase_add_test(tc_utils, test_ip_recv_drops_broadcast_source);
tcase_add_test(tc_utils, test_ip_recv_drops_multicast_source);
Expand All @@ -237,6 +239,7 @@ Suite *wolf_suite(void)
tcase_add_test(tc_utils, test_multicast_udp_receive_requires_join);
tcase_add_test(tc_utils, test_multicast_udp_send_mac_ttl_loop_and_options);
tcase_add_test(tc_utils, test_multicast_igmp_query_refreshes_report);
tcase_add_test(tc_utils, test_multicast_igmp_query_bad_checksum_dropped);
tcase_add_test(tc_utils, test_multicast_join_requires_configured_ip);
tcase_add_test(tc_utils, test_multicast_if_pins_egress_interface);
tcase_add_test(tc_utils, test_multicast_loop_does_not_fire_on_blocked_send);
Expand Down Expand Up @@ -392,6 +395,7 @@ Suite *wolf_suite(void)
tcase_add_test(tc_utils, test_udp_try_recv_full_fifo_drop_does_not_set_readable_or_send_icmp);
tcase_add_test(tc_utils, test_dns_callback_bad_flags);
tcase_add_test(tc_utils, test_dns_callback_truncated_response_aborts_query);
tcase_add_test(tc_utils, test_regression_dns_callback_high_bit_octet_ip_no_ub);
tcase_add_test(tc_utils, test_dns_callback_bad_name);
tcase_add_test(tc_utils, test_dns_callback_short_header_ignored);
tcase_add_test(tc_utils, test_dns_callback_wrong_id_ignored);
Expand Down Expand Up @@ -641,6 +645,7 @@ Suite *wolf_suite(void)
tcase_add_test(tc_utils, test_tcp_input_fin_wait_2_ack_with_payload_receives);
tcase_add_test(tc_utils, test_tcp_input_fin_wait_2_fin_with_payload_queues);
tcase_add_test(tc_utils, test_tcp_input_fin_wait_2_fin_payload_ack_mismatch_no_transition);
tcase_add_test(tc_utils, test_tcp_input_time_wait_retransmitted_fin_acks);
tcase_add_test(tc_utils, test_tcp_sock_close_state_transitions);
tcase_add_test(tc_utils, test_tcp_input_fin_wait_1_fin_with_payload_returns);
tcase_add_test(tc_utils, test_tcp_input_fin_wait_1_fin_out_of_order_no_transition);
Expand All @@ -665,6 +670,7 @@ Suite *wolf_suite(void)
tcase_add_test(tc_proto, test_arp_lookup_expired_entry_rejected);
tcase_add_test(tc_proto, test_arp_reply_updates_expired_entry);
tcase_add_test(tc_proto, test_wolfip_recv_ex_multi_interface_arp_reply);
tcase_add_test(tc_proto, test_wolfip_recv_ex_runt_eth_frame_drops_before_filter);
tcase_add_test(tc_proto, test_forward_prepare_null_args);
tcase_add_test(tc_proto, test_send_ttl_exceeded_includes_full_ip_header_with_options);
tcase_add_test(tc_proto, test_send_ttl_exceeded_filter_drop);
Expand Down Expand Up @@ -714,6 +720,7 @@ Suite *wolf_suite(void)
tcase_add_test(tc_proto, test_arp_recv_null_stack);
tcase_add_test(tc_proto, test_arp_recv_request_sends_reply);
tcase_add_test(tc_proto, test_arp_recv_request_does_not_store_self_neighbor);
tcase_add_test(tc_proto, test_arp_request_flood_does_not_lock_out_legit_reply);
tcase_add_test(tc_proto, test_arp_recv_request_no_send_fn);
tcase_add_test(tc_proto, test_wolfip_if_for_local_ip_paths);
tcase_add_test(tc_proto, test_wolfip_if_for_local_ip_null_found);
Expand Down Expand Up @@ -783,6 +790,7 @@ Suite *wolf_suite(void)
tcase_add_test(tc_proto, test_forward_packet_ip_filter_drop);
tcase_add_test(tc_proto, test_forward_packet_eth_filter_drop);
tcase_add_test(tc_proto, test_loopback_dest_not_forwarded);
tcase_add_test(tc_proto, test_regression_forwarding_rpf_drops_spoofed_source);
tcase_add_test(tc_proto, test_tcp_listen_rejects_wrong_interface);
tcase_add_test(tc_proto, test_tcp_listen_accepts_bound_interface);
tcase_add_test(tc_proto, test_tcp_listen_accepts_any_interface);
Expand Down Expand Up @@ -828,6 +836,7 @@ Suite *wolf_suite(void)
tcase_add_test(tc_proto, test_regression_timer_heap_insert_bounded_by_max_timers);
tcase_add_test(tc_proto, test_regression_icmp_inflated_ip_len);
tcase_add_test(tc_proto, test_regression_udp_inflated_udp_len);
tcase_add_test(tc_proto, test_regression_udp_len_exceeds_ip_len_dropped);
tcase_add_test(tc_proto, test_regression_udp_len_below_header_discards_and_unblocks);
tcase_add_test(tc_proto, test_regression_udp_payload_exceeds_buffer_discards_and_unblocks);
tcase_add_test(tc_proto, test_regression_icmp_payload_exceeds_buffer_discards_and_unblocks);
Expand Down
75 changes: 75 additions & 0 deletions src/test/unit/unit_tests_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,6 +465,23 @@ START_TEST(test_sock_socket_errors)
ck_assert_int_eq(wolfIP_sock_socket(&s, AF_INET, IPSTACK_SOCK_DGRAM, WI_IPPROTO_TCP), -1);
}
END_TEST

START_TEST(test_regression_sock_socket_null_wolfip_returns_einval)
{
ck_assert_int_eq(wolfIP_sock_socket(NULL, AF_INET, IPSTACK_SOCK_STREAM, WI_IPPROTO_TCP),
-WOLFIP_EINVAL);
ck_assert_int_eq(wolfIP_sock_socket(NULL, AF_INET, IPSTACK_SOCK_DGRAM, WI_IPPROTO_UDP),
-WOLFIP_EINVAL);
ck_assert_int_eq(wolfIP_sock_socket(NULL, AF_INET, IPSTACK_SOCK_DGRAM, 0),
-WOLFIP_EINVAL);
ck_assert_int_eq(wolfIP_sock_socket(NULL, AF_INET, IPSTACK_SOCK_DGRAM, WI_IPPROTO_ICMP),
-WOLFIP_EINVAL);
ck_assert_int_eq(wolfIP_sock_socket(NULL, AF_INET, IPSTACK_SOCK_RAW, WI_IPPROTO_UDP),
-WOLFIP_EINVAL);
ck_assert_int_eq(wolfIP_sock_socket(NULL, AF_PACKET, IPSTACK_SOCK_RAW, ee16(ETH_TYPE_IP)),
-WOLFIP_EINVAL);
}
END_TEST
START_TEST(test_udp_sendto_and_recvfrom)
{
struct wolfIP s;
Expand Down Expand Up @@ -3836,6 +3853,64 @@ START_TEST(test_syn_sent_bare_rst_dropped)
}
END_TEST

/* Regression: per RFC 9293 §3.10.7.3, an RST+ACK in SYN_SENT is acceptable
* only when SND.UNA < SEG.ACK <= SND.NXT. After connect(), snd_una == seq
* (the ISN) and SND.NXT == seq+1, so the only valid seg_ack is isn+1.
* Pin both bounds so deletion of the upper-bound clause or < <-> <= mutations
* on either bound are caught. */
START_TEST(test_syn_sent_rst_ack_seg_ack_bounds)
{
struct wolfIP s;
int sd;
struct tsocket *ts;
struct wolfIP_sockaddr_in sin;
uint32_t isn;

wolfIP_init(&s);
mock_link_init(&s);
wolfIP_ipconfig_set(&s, 0x0A000001U, 0xFFFFFF00U, 0);

sd = wolfIP_sock_socket(&s, AF_INET, IPSTACK_SOCK_STREAM, WI_IPPROTO_TCP);
ck_assert_int_gt(sd, 0);
memset(&sin, 0, sizeof(sin));
sin.sin_family = AF_INET;
sin.sin_port = ee16(80);
sin.sin_addr.s_addr = ee32(0x0A000002U);
ck_assert_int_eq(wolfIP_sock_connect(&s, sd, (struct wolfIP_sockaddr *)&sin, sizeof(sin)),
-WOLFIP_EAGAIN);

ts = &s.tcpsockets[SOCKET_UNMARK(sd)];
ck_assert_int_eq(ts->sock.tcp.state, TCP_SYN_SENT);
isn = ts->sock.tcp.seq;

/* seg_ack == snd_una (lower-bound equality): must be dropped */
inject_tcp_segment(&s, TEST_PRIMARY_IF,
0x0A000002U, 0x0A000001U,
80, ts->src_port,
1000, isn,
TCP_FLAG_RST | TCP_FLAG_ACK);
ck_assert_uint_eq(ts->proto, WI_IPPROTO_TCP);
ck_assert_int_eq(ts->sock.tcp.state, TCP_SYN_SENT);

/* seg_ack == snd_nxt + 1 (above SND.NXT): must be dropped */
inject_tcp_segment(&s, TEST_PRIMARY_IF,
0x0A000002U, 0x0A000001U,
80, ts->src_port,
1000, isn + 2,
TCP_FLAG_RST | TCP_FLAG_ACK);
ck_assert_uint_eq(ts->proto, WI_IPPROTO_TCP);
ck_assert_int_eq(ts->sock.tcp.state, TCP_SYN_SENT);

/* seg_ack == snd_nxt (only valid value): must close the socket */
inject_tcp_segment(&s, TEST_PRIMARY_IF,
0x0A000002U, 0x0A000001U,
80, ts->src_port,
1000, isn + 1,
TCP_FLAG_RST | TCP_FLAG_ACK);
ck_assert_uint_eq(ts->proto, 0);
}
END_TEST

/* Regression: in SYN_RCVD, a RST with a sequence number outside the receive
* window must be silently dropped per RFC 9293 §3.10.7. The SYN_RCVD branch
* bypassed the window check entirely, accepting any RST. */
Expand Down
70 changes: 70 additions & 0 deletions src/test/unit/unit_tests_dns_dhcp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4807,6 +4807,7 @@ START_TEST(test_udp_try_recv_filter_drop)

memset(&udp, 0, sizeof(udp));
udp.ip.dst = ee32(local_ip);
udp.ip.len = ee16(IP_HEADER_LEN + UDP_HEADER_LEN + 4);
udp.dst_port = ee16(1234);
udp.len = ee16(UDP_HEADER_LEN + 4);
udp_try_recv(&s, TEST_PRIMARY_IF, &udp, (uint32_t)(ETH_HEADER_LEN + IP_HEADER_LEN + UDP_HEADER_LEN + 4));
Expand Down Expand Up @@ -4838,6 +4839,7 @@ START_TEST(test_udp_try_recv_conf_null)

memset(udp_buf, 0, sizeof(udp_buf));
udp->ip.dst = ee32(dst_ip);
udp->ip.len = ee16(IP_HEADER_LEN + UDP_HEADER_LEN + 4);
udp->dst_port = ee16(1234);
udp->len = ee16(UDP_HEADER_LEN + 4);
udp_try_recv(&s, TEST_PRIMARY_IF, udp, (uint32_t)(ETH_HEADER_LEN + IP_HEADER_LEN + UDP_HEADER_LEN + 4));
Expand All @@ -4864,6 +4866,7 @@ START_TEST(test_udp_try_recv_remote_ip_matches_local_ip)

memset(&udp, 0, sizeof(udp));
udp.ip.dst = ee32(local_ip);
udp.ip.len = ee16(IP_HEADER_LEN + UDP_HEADER_LEN + 4);
udp.dst_port = ee16(1234);
udp.len = ee16(UDP_HEADER_LEN + 4);
udp_try_recv(&s, TEST_PRIMARY_IF, &udp, (uint32_t)(ETH_HEADER_LEN + IP_HEADER_LEN + UDP_HEADER_LEN + 4));
Expand Down Expand Up @@ -4891,6 +4894,7 @@ START_TEST(test_udp_try_recv_dhcp_running_local_zero)

memset(udp_buf, 0, sizeof(udp_buf));
udp->ip.dst = ee32(local_ip);
udp->ip.len = ee16(IP_HEADER_LEN + UDP_HEADER_LEN + 4);
udp->dst_port = ee16(1234);
udp->len = ee16(UDP_HEADER_LEN + 4);
udp_try_recv(&s, TEST_PRIMARY_IF, udp, (uint32_t)(ETH_HEADER_LEN + IP_HEADER_LEN + UDP_HEADER_LEN + 4));
Expand All @@ -4916,6 +4920,7 @@ START_TEST(test_udp_try_recv_short_expected_len)

memset(&udp, 0, sizeof(udp));
udp.ip.dst = ee32(local_ip);
udp.ip.len = ee16(IP_HEADER_LEN + UDP_HEADER_LEN + 10);
udp.dst_port = ee16(1234);
udp.len = ee16(UDP_HEADER_LEN + 10);
udp_try_recv(&s, TEST_PRIMARY_IF, &udp, (uint32_t)(ETH_HEADER_LEN + IP_HEADER_LEN + UDP_HEADER_LEN + 4));
Expand Down Expand Up @@ -5182,6 +5187,71 @@ START_TEST(test_dns_callback_truncated_response_aborts_query)
}
END_TEST

START_TEST(test_regression_dns_callback_high_bit_octet_ip_no_ub)
{
/* The dns_callback() A-record reassembly used to compute
* ip = (buf[pos+3] & 0xFF) | ... | ((buf[pos+0] & 0xFF) << 24);
* with buf typed as char (signed by default). For the high-bit
* case (top octet >= 0x80) the int-typed (... & 0xFF) << 24
* produces a value that is not representable in int, which is
* undefined behavior per ISO C11 6.5.7p4. Under -fsanitize=undefined
* (make unit-ubsan) that shift trips a runtime error; this test
* pins the contract that high-bit IPs both (a) do not invoke UB
* and (b) are delivered to dns_lookup_cb byte-for-byte intact. */
struct wolfIP s;
uint8_t response[128];
int pos;
struct dns_header *hdr = (struct dns_header *)response;
struct dns_question *q;
struct dns_rr *rr;
const uint8_t ip_bytes[4] = {0xC8, 0x0A, 0x14, 0x1E}; /* 200.10.20.30 */

wolfIP_init(&s);
mock_link_init(&s);
s.dns_server = 0x0A000001U;
s.dns_query_type = DNS_QUERY_TYPE_A;
s.dns_id = 0x1234;
s.dns_lookup_cb = test_dns_lookup_cb;
dns_lookup_calls = 0;
dns_lookup_ip = 0;
s.dns_udp_sd = wolfIP_sock_socket(&s, AF_INET, IPSTACK_SOCK_DGRAM, WI_IPPROTO_UDP);
ck_assert_int_gt(s.dns_udp_sd, 0);

memset(response, 0, sizeof(response));
hdr->id = ee16(s.dns_id);
hdr->flags = ee16(0x8100);
hdr->qdcount = ee16(1);
hdr->ancount = ee16(1);
pos = sizeof(struct dns_header);
response[pos++] = 7; memcpy(&response[pos], "example", 7); pos += 7;
response[pos++] = 3; memcpy(&response[pos], "com", 3); pos += 3;
response[pos++] = 0;
q = (struct dns_question *)(response + pos);
q->qtype = ee16(DNS_A);
q->qclass = ee16(1);
pos += sizeof(struct dns_question);
response[pos++] = 0xC0;
response[pos++] = (uint8_t)sizeof(struct dns_header);
rr = (struct dns_rr *)(response + pos);
rr->type = ee16(DNS_A);
rr->class = ee16(1);
rr->ttl = ee32(60);
rr->rdlength = ee16(4);
pos += sizeof(struct dns_rr);
memcpy(&response[pos], ip_bytes, sizeof(ip_bytes));
pos += sizeof(ip_bytes);

enqueue_udp_rx(&s.udpsockets[SOCKET_UNMARK(s.dns_udp_sd)], response, (uint16_t)pos, DNS_PORT);
dns_callback(s.dns_udp_sd, CB_EVENT_READABLE, &s);

ck_assert_int_eq(dns_lookup_calls, 1);
ck_assert_uint_eq(dns_lookup_ip, 0xC80A141EU);
ck_assert_uint_eq(s.dns_id, 0);
ck_assert_int_eq(s.dns_query_type, DNS_QUERY_TYPE_NONE);
ck_assert_ptr_eq(s.dns_lookup_cb, NULL);
}
END_TEST

START_TEST(test_dns_callback_bad_name)
{
struct wolfIP s;
Expand Down
41 changes: 41 additions & 0 deletions src/test/unit/unit_tests_multicast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,47 @@ START_TEST(test_multicast_igmp_query_refreshes_report)
}
END_TEST

START_TEST(test_multicast_igmp_query_bad_checksum_dropped)
{
struct wolfIP s;
int sd;
struct wolfIP_ip_mreq mreq;
uint8_t frame[ETH_HEADER_LEN + IP_HEADER_LEN + IGMPV3_QUERY_MIN_LEN];
struct wolfIP_ip_packet *ip = (struct wolfIP_ip_packet *)frame;
uint8_t *igmp = frame + ETH_HEADER_LEN + IP_HEADER_LEN;
ip4 group = 0xE9010207U;

wolfIP_init(&s);
mock_link_init(&s);
wolfIP_ipconfig_set(&s, 0x0A000002U, 0xFFFFFF00U, 0);
sd = wolfIP_sock_socket(&s, AF_INET, IPSTACK_SOCK_DGRAM, WI_IPPROTO_UDP);
ck_assert_int_gt(sd, 0);
multicast_mreq(&mreq, group, IPADDR_ANY);
ck_assert_int_eq(wolfIP_sock_setsockopt(&s, sd, WOLFIP_SOL_IP,
WOLFIP_IP_ADD_MEMBERSHIP, &mreq, sizeof(mreq)), 0);

memset(frame, 0, sizeof(frame));
memcpy(ip->eth.dst, "\x01\x00\x5e\x00\x00\x01", 6);
memcpy(ip->eth.src, "\x02\x00\x00\x00\x00\x01", 6);
ip->eth.type = ee16(ETH_TYPE_IP);
ip->ver_ihl = 0x45;
ip->ttl = 1;
ip->proto = WI_IPPROTO_IGMP;
ip->len = ee16(IP_HEADER_LEN + IGMPV3_QUERY_MIN_LEN);
ip->src = ee32(0x0A000001U);
ip->dst = ee32(IGMP_ALL_HOSTS);
igmp[0] = IGMP_TYPE_MEMBERSHIP_QUERY;
put_be32(igmp + 4, group);
put_be16(igmp + 2, ip_checksum_buf(igmp, IGMPV3_QUERY_MIN_LEN));
igmp[2] ^= 0x01;
fix_ip_checksum(ip);

last_frame_sent_size = 0;
wolfIP_recv_ex(&s, TEST_PRIMARY_IF, frame, sizeof(frame));
ck_assert_uint_eq(last_frame_sent_size, 0);
}
END_TEST

START_TEST(test_multicast_join_requires_configured_ip)
{
struct wolfIP s;
Expand Down
Loading
Loading