picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10695 from yuwata/fuzz-network-fixes 

network: fix recent issues found by oss-fuzz
This commit is contained in:
Lennart Poettering 2018-11-09 14:49:37 +01:00 committed by GitHub
parent 911efe0fbf 872faf59c0
commit 3306711ffb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/networkd-network-gperf.gperf
View File

@ -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)

2
src/network/networkd-network.c
View File

@ -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)

2
test/fuzz/fuzz-network-parser/oss-fuzz-11302 Normal file
View File

@ -0,0 +1,2 @@
[Network]
IPv6MTUBytes=7K

5
test/fuzz/fuzz-network-parser/oss-fuzz-11314 Normal file
View File

@ -0,0 +1,5 @@
[Network]
IPv6MTUBytes=6M
Bond=