dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-03 22:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

icmp6-util: make icmp6_receive() refuse packets without IPv6 sender address

Browse Source 
Previously, the function supports packets without IPv6 sender address
for unit tests. However, now unit tests use their own version of
icmp6_receive(). Hence, let's make the check more strict.
This commit is contained in:
Yu Watanabe
2024-02-22 14:28:52 +09:00
committed by Luca Boccassi
parent 28eef15898
commit 9f0430b74b
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -165,7 +165,6 @@ int icmp6_receive(
.msg_control = &control,
.msg_controllen = sizeof(control),
};
struct in6_addr addr = {};
ssize_t len;
iov = IOVEC_MAKE(buffer, size);
@@ -177,17 +176,11 @@ int icmp6_receive(
if ((size_t) len != size)
return -EINVAL;
if (msg.msg_namelen == sizeof(struct sockaddr_in6) &&
sa.in6.sin6_family == AF_INET6) {
addr = sa.in6.sin6_addr;
if (!in6_addr_is_link_local(&addr) && !in6_addr_is_null(&addr))
return -EADDRNOTAVAIL;
} else if (msg.msg_namelen > 0)
if (msg.msg_namelen != sizeof(struct sockaddr_in6) || sa.in6.sin6_family != AF_INET6)
return -EPFNOSUPPORT;
/* namelen == 0 only happens when running the test-suite over a socketpair */
if (!in6_addr_is_link_local(&sa.in6.sin6_addr) && !in6_addr_is_null(&sa.in6.sin6_addr))
return -EADDRNOTAVAIL;
assert(!(msg.msg_flags & MSG_TRUNC));
@@ -198,6 +191,6 @@ int icmp6_receive(
if (ret_timestamp)
triple_timestamp_from_cmsg(ret_timestamp, &msg);
if (ret_sender)
*ret_sender = addr;
*ret_sender = sa.in6.sin6_addr;
return 0;
}