shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-21 02:50:18 +03:00
Code

Merge pull request #28575 from yuwata/network-address-next-part3

Browse Source 
network: check specified address settings in more detail
This commit is contained in:
Yu Watanabe 2023-07-31 00:59:31 +09:00 committed by GitHub
commit 86d1f7c974
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/network/networkd-address.c
View File

@ -26,6 +26,39 @@
#define ADDRESSES_PER_LINK_MAX 2048U
#define STATIC_ADDRESSES_PER_NETWORK_MAX 1024U
#define KNOWN_FLAGS \
(IFA_F_SECONDARY | \
IFA_F_NODAD | \
IFA_F_OPTIMISTIC | \
IFA_F_DADFAILED | \
IFA_F_HOMEADDRESS | \
IFA_F_DEPRECATED | \
IFA_F_TENTATIVE | \
IFA_F_PERMANENT | \
IFA_F_MANAGETEMPADDR | \
IFA_F_NOPREFIXROUTE | \
IFA_F_MCAUTOJOIN | \
IFA_F_STABLE_PRIVACY)
/* From net/ipv4/devinet.c */
#define IPV6ONLY_FLAGS \
(IFA_F_NODAD | \
IFA_F_OPTIMISTIC | \
IFA_F_DADFAILED | \
IFA_F_HOMEADDRESS | \
IFA_F_TENTATIVE | \
IFA_F_MANAGETEMPADDR | \
IFA_F_STABLE_PRIVACY)
/* We do not control the following flags. */
#define UNMANAGED_FLAGS \
(IFA_F_SECONDARY | \
IFA_F_DADFAILED | \
IFA_F_DEPRECATED | \
IFA_F_TENTATIVE | \
IFA_F_PERMANENT | \
IFA_F_STABLE_PRIVACY)
int address_flags_to_string_alloc(uint32_t flags, int family, char **ret) {
_cleanup_free_ char *str = NULL;
static const char* map[] = {
@ -2151,11 +2184,17 @@ static int address_section_verify(Address *address) {
assert(address->section);
return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: Address section without Address= field configured. "
"%s: Address section without Address= field was configured. "
"Ignoring [Address] section from line %u.",
address->section->filename, address->section->line);
}
if (address->family == AF_INET6 && !socket_ipv6_is_supported())
return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: an IPv6 address was configured, but the kernel does not support IPv6. "
"Ignoring [Address] section from line %u.",
address->section->filename, address->section->line);
assert(IN_SET(address->family, AF_INET, AF_INET6));
address_section_adjust_broadcast(address);
@ -2193,6 +2232,19 @@ static int address_section_verify(Address *address) {
!FLAGS_SET(address->duplicate_address_detection, ADDRESS_FAMILY_IPV6))
address->flags |= IFA_F_NODAD;
uint32_t filtered_flags = address->family == AF_INET ?
address->flags & KNOWN_FLAGS & ~UNMANAGED_FLAGS & ~IPV6ONLY_FLAGS :
address->flags & KNOWN_FLAGS & ~UNMANAGED_FLAGS;
if (address->flags != filtered_flags) {
_cleanup_free_ char *str = NULL;
(void) address_flags_to_string_alloc(filtered_flags, address->family, &str);
return log_warning_errno(SYNTHETIC_ERRNO(EINVAL),
"%s: unexpected address flags \"%s\" were configured. "
"Ignoring [Address] section from line %u.",
address->section->filename, strna(str), address->section->line);
}
return 0;
}