diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-11-09 14:49:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-09 14:49:37 +0100 |
| commit | 3306711ffb28431263ab85b1a2f016b789a1ffaa (patch) | |
| tree | 025aed419a0aebe99bc634a788869f9096ff8a8c /src | |
| parent | 911efe0fbf23ac51b2e8516dc02df3f8973ff758 (diff) | |
| parent | 872faf59c0370d7fc3ec16c5fb50918398234971 (diff) | |
| download | systemd-3306711ffb28431263ab85b1a2f016b789a1ffaa.tar.gz systemd-3306711ffb28431263ab85b1a2f016b789a1ffaa.tar.bz2 systemd-3306711ffb28431263ab85b1a2f016b789a1ffaa.zip | |
Merge pull request #10695 from yuwata/fuzz-network-fixes
network: fix recent issues found by oss-fuzz
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/networkd-network-gperf.gperf | 2 | ||||
| -rw-r--r-- | src/network/networkd-network.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf index adbba5f480..8bbdd290ad 100644 --- a/src/network/networkd-network-gperf.gperf +++ b/src/network/networkd-network-gperf.gperf @@ -72,7 +72,7 @@ Network.IPv6AcceptRouterAdvertisements, config_parse_tristate, Network.IPv6DuplicateAddressDetection, config_parse_int, 0, offsetof(Network, ipv6_dad_transmits) Network.IPv6HopLimit, config_parse_int, 0, offsetof(Network, ipv6_hop_limit) Network.IPv6ProxyNDP, config_parse_tristate, 0, offsetof(Network, ipv6_proxy_ndp) -Network.IPv6MTUBytes, config_parse_mtu, AF_INET6, 0 +Network.IPv6MTUBytes, config_parse_mtu, AF_INET6, offsetof(Network, ipv6_mtu) Network.ActiveSlave, config_parse_bool, 0, offsetof(Network, active_slave) Network.PrimarySlave, config_parse_bool, 0, offsetof(Network, primary_slave) Network.IPv4ProxyARP, config_parse_tristate, 0, offsetof(Network, proxy_arp) diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index 4eb553125b..bf910956cb 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -413,7 +413,7 @@ void network_free(Network *network) { if (network->manager->networks) LIST_REMOVE(networks, network->manager->networks, network); - if (network->manager->networks_by_name) + if (network->manager->networks_by_name && network->name) hashmap_remove(network->manager->networks_by_name, network->name); if (network->manager->duids_requesting_uuid) |