shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-27 10:25:37 +03:00
Code

Merge pull request #29052 from yuwata/icmp6-util-cleanups

Browse Source 
icmp6-util: several cleanups and fixlets
This commit is contained in:
Yu Watanabe 2023-09-05 00:15:23 +09:00 committed by GitHub
commit 8b1bd20722
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 110 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/libsystemd-network/fuzz-ndisc-rs.c
View File

@ -9,35 +9,10 @@
#include "alloc-util.h"
#include "fd-util.h"
#include "fuzz.h"
#include "icmp6-util.h"
#include "icmp6-util-unix.h"
#include "ndisc-internal.h"
#include "socket-util.h"
static int test_fd[2] = PIPE_EBADF;
int icmp6_bind_router_solicitation(int index) {
assert_se(socketpair(AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0, test_fd) >= 0);
return test_fd[0];
}
int icmp6_bind_router_advertisement(int index) {
return -ENOSYS;
}
int icmp6_receive(int fd, void *iov_base, size_t iov_len,
struct in6_addr *dst, triple_timestamp *timestamp) {
assert_se(read(fd, iov_base, iov_len) == (ssize_t) iov_len);
if (timestamp)
triple_timestamp_get(timestamp);
return 0;
}
int icmp6_send_router_solicitation(int s, const struct ether_addr *ether_addr) {
return 0;
}
int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
struct ether_addr mac_addr = {
.ether_addr_octet = {'A', 'B', 'C', '1', '2', '3'}

53
src/libsystemd-network/icmp6-util-unix.c Normal file
View File

@ -0,0 +1,53 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#include <netinet/ip6.h>
#include <unistd.h>
#include "fd-util.h"
#include "icmp6-util-unix.h"
send_ra_t send_ra_function = NULL;
int test_fd[2] = PIPE_EBADF;
static struct in6_addr dummy_link_local = {
.s6_addr = {
0xfe, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x12, 0x34, 0x56, 0xff, 0xfe, 0x78, 0x9a, 0xbc,
},
};
int icmp6_bind_router_solicitation(int ifindex) {
if (socketpair(AF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0, test_fd) < 0)
return -errno;
return test_fd[0];
}
int icmp6_bind_router_advertisement(int ifindex) {
return test_fd[1];
}
int icmp6_send_router_solicitation(int s, const struct ether_addr *ether_addr) {
if (!send_ra_function)
return 0;
return send_ra_function(0);
}
int icmp6_receive(
int fd,
void *iov_base,
size_t iov_len,
struct in6_addr *ret_sender,
triple_timestamp *ret_timestamp) {
assert_se(read (fd, iov_base, iov_len) == (ssize_t) iov_len);
if (ret_timestamp)
triple_timestamp_get(ret_timestamp);
if (ret_sender)
*ret_sender = dummy_link_local;
return 0;
}

9
src/libsystemd-network/icmp6-util-unix.h Normal file
View File

@ -0,0 +1,9 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
#pragma once
#include "icmp6-util.h"
typedef int (*send_ra_t)(uint8_t flags);
extern send_ra_t send_ra_function;
extern int test_fd[2];

22
src/libsystemd-network/icmp6-util.c
View File

@ -144,8 +144,12 @@ int icmp6_send_router_solicitation(int s, const struct ether_addr *ether_addr) {
return 0;
}
int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *ret_dst,
triple_timestamp *ret_timestamp) {
int icmp6_receive(
int fd,
void *buffer,
size_t size,
struct in6_addr *ret_sender,
triple_timestamp *ret_timestamp) {
/* This needs to be initialized with zero. See #20741. */
CMSG_BUFFER_TYPE(CMSG_SPACE(sizeof(int)) + /* ttl */
@ -178,7 +182,7 @@ int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *ret_dst,
sa.in6.sin6_family == AF_INET6) {
addr = sa.in6.sin6_addr;
if (!in6_addr_is_link_local(&addr))
if (!in6_addr_is_link_local(&addr) && !in6_addr_is_null(&addr))
return -EADDRNOTAVAIL;
} else if (msg.msg_namelen > 0)
@ -206,10 +210,14 @@ int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *ret_dst,
}
}
if (!triple_timestamp_is_set(&t))
triple_timestamp_get(&t);
if (ret_timestamp) {
if (triple_timestamp_is_set(&t))
*ret_timestamp = t;
else
triple_timestamp_get(ret_timestamp);
}
*ret_dst = addr;
*ret_timestamp = t;
if (ret_sender)
*ret_sender = addr;
return 0;
}

8
src/libsystemd-network/icmp6-util.h
View File

@ -20,5 +20,9 @@
int icmp6_bind_router_solicitation(int ifindex);
int icmp6_bind_router_advertisement(int ifindex);
int icmp6_send_router_solicitation(int s, const struct ether_addr *ether_addr);
int icmp6_receive(int fd, void *buffer, size_t size, struct in6_addr *ret_dst,
triple_timestamp *ret_timestamp);
int icmp6_receive(
int fd,
void *buffer,
size_t size,
struct in6_addr *ret_sender,
triple_timestamp *ret_timestamp);

15
src/libsystemd-network/meson.build
View File

@ -84,10 +84,16 @@ executables += [
'sources' : files('test-lldp-rx.c'),
},
network_test_template + {
'sources' : files('test-ndisc-ra.c'),
'sources' : files(
'test-ndisc-ra.c',
'icmp6-util-unix.c',
),
},
network_test_template + {
'sources' : files('test-ndisc-rs.c'),
'sources' : files(
'test-ndisc-rs.c',
'icmp6-util-unix.c',
),
},
network_test_template + {
'sources' : files('test-sd-dhcp-lease.c'),
@ -108,6 +114,9 @@ executables += [
'sources' : files('fuzz-lldp-rx.c'),
},
network_fuzz_template + {
'sources' : files('fuzz-ndisc-rs.c'),
'sources' : files(
'fuzz-ndisc-rs.c',
'icmp6-util-unix.c',
),
},
]

8
src/libsystemd-network/sd-ndisc.c
View File

@ -225,8 +225,7 @@ static int ndisc_recv(sd_event_source *s, int fd, uint32_t revents, void *userda
if (r < 0)
switch (r) {
case -EADDRNOTAVAIL:
log_ndisc(nd, "Received RA from non-link-local address %s. Ignoring.",
IN6_ADDR_TO_STRING(&rt->address));
log_ndisc(nd, "Received RA from neither link-local nor null address. Ignoring.");
return 0;
case -EMULTIHOP:
@ -242,6 +241,11 @@ static int ndisc_recv(sd_event_source *s, int fd, uint32_t revents, void *userda
return 0;
}
/* The function icmp6_receive() accepts the null source address, but RFC 4861 Section 6.1.2 states
* that hosts MUST discard messages with the null source address. */
if (in6_addr_is_null(&rt->address))
log_ndisc(nd, "Received RA from null address. Ignoring.");
(void) event_source_disable(nd->timeout_event_source);
(void) ndisc_handle_datagram(nd, rt);
return 0;

6
src/libsystemd-network/sd-radv.c
View File

@ -275,8 +275,7 @@ static int radv_recv(sd_event_source *s, int fd, uint32_t revents, void *userdat
if (r < 0)
switch (r) {
case -EADDRNOTAVAIL:
log_radv(ra, "Received RS from non-link-local address %s. Ignoring",
IN6_ADDR_TO_STRING(&src));
log_radv(ra, "Received RS from neither link-local nor null address. Ignoring");
return 0;
case -EMULTIHOP:
@ -297,6 +296,9 @@ static int radv_recv(sd_event_source *s, int fd, uint32_t revents, void *userdat
return 0;
}
/* TODO: if the sender address is null, check that the message does not have the source link-layer
* address option. See RFC 4861 Section 6.1.1. */
const char *addr = IN6_ADDR_TO_STRING(&src);
r = radv_send(ra, &src, ra->lifetime_usec);

28
src/libsystemd-network/test-ndisc-ra.c
View File

@ -11,7 +11,7 @@
#include "alloc-util.h"
#include "hexdecoct.h"
#include "icmp6-util.h"
#include "icmp6-util-unix.h"
#include "socket-util.h"
#include "strv.h"
#include "tests.h"
@ -52,7 +52,6 @@ static uint8_t advertisement[] = {
};
static bool test_stopped;
static int test_fd[2];
static struct {
struct in6_addr address;
unsigned char prefixlen;
@ -208,31 +207,6 @@ TEST(radv) {
assert_se(!ra);
}
int icmp6_bind_router_solicitation(int ifindex) {
return -ENOSYS;
}
int icmp6_bind_router_advertisement(int ifindex) {
assert_se(ifindex == 42);
return test_fd[1];
}
int icmp6_send_router_solicitation(int s, const struct ether_addr *ether_addr) {
return 0;
}
int icmp6_receive(int fd, void *iov_base, size_t iov_len,
struct in6_addr *dst, triple_timestamp *timestamp) {
assert_se(read (fd, iov_base, iov_len) == (ssize_t)iov_len);
if (timestamp)
triple_timestamp_get(timestamp);
return 0;
}
static int radv_recv(sd_event_source *s, int fd, uint32_t revents, void *userdata) {
sd_radv *ra = userdata;
unsigned char buf[168];

39
src/libsystemd-network/test-ndisc-rs.c
View File

@ -12,7 +12,7 @@
#include "alloc-util.h"
#include "fd-util.h"
#include "hexdecoct.h"
#include "icmp6-util.h"
#include "icmp6-util-unix.h"
#include "socket-util.h"
#include "strv.h"
#include "ndisc-internal.h"
@ -23,12 +23,8 @@ static struct ether_addr mac_addr = {
};
static bool verbose = false;
static int test_fd[2];
static sd_ndisc *test_timeout_nd;
typedef int (*send_ra_t)(uint8_t flags);
static send_ra_t send_ra_function;
static void router_dump(sd_ndisc_router *rt) {
struct in6_addr addr;
uint8_t hop_limit;
@ -41,7 +37,8 @@ static void router_dump(sd_ndisc_router *rt) {
assert_se(rt);
log_info("--");
assert_se(sd_ndisc_router_get_address(rt, &addr) == -ENODATA);
assert_se(sd_ndisc_router_get_address(rt, &addr) >= 0);
log_info("Sender: %s", IN6_ADDR_TO_STRING(&addr));
assert_se(sd_ndisc_router_get_timestamp(rt, CLOCK_REALTIME, &t) >= 0);
log_info("Timestamp: %s", FORMAT_TIMESTAMP(t));
@ -163,29 +160,6 @@ static void router_dump(sd_ndisc_router *rt) {
}
}
int icmp6_bind_router_solicitation(int ifindex) {
assert_se(ifindex == 42);
if (socketpair(AF_UNIX, SOCK_DGRAM | SOCK_CLOEXEC | SOCK_NONBLOCK, 0, test_fd) < 0)
return -errno;
return test_fd[0];
}
int icmp6_bind_router_advertisement(int ifindex) {
return -ENOSYS;
}
int icmp6_receive(int fd, void *iov_base, size_t iov_len,
struct in6_addr *dst, triple_timestamp *timestamp) {
assert_se(read (fd, iov_base, iov_len) == (ssize_t)iov_len);
if (timestamp)
triple_timestamp_get(timestamp);
return 0;
}
static int send_ra(uint8_t flags) {
uint8_t advertisement[] = {
0x86, 0x00, 0xde, 0x83, 0x40, 0xc0, 0x00, 0xb4,
@ -214,13 +188,6 @@ static int send_ra(uint8_t flags) {
return 0;
}
int icmp6_send_router_solicitation(int s, const struct ether_addr *ether_addr) {
if (!send_ra_function)
return 0;
return send_ra_function(0);
}
static void test_callback(sd_ndisc *nd, sd_ndisc_event_t event, sd_ndisc_router *rt, void *userdata) {
sd_event *e = userdata;
static unsigned idx = 0;