From d493d826479e869fd45444af20f870c1e7c94476 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 9 Nov 2018 11:42:11 +0900 Subject: [PATCH 1/3] network: fix offset for IPv6MTUByte= Fixes oss-fuzz#11302 and oss-fuzz#11314. --- src/network/networkd-network-gperf.gperf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From e512c6c1aae4f0fed81eb04eb35f3d6600ab1181 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 9 Nov 2018 11:43:50 +0900 Subject: [PATCH 2/3] network: fix potential segfault in network_free() --- src/network/networkd-network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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) From 872faf59c0370d7fc3ec16c5fb50918398234971 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 9 Nov 2018 11:45:43 +0900 Subject: [PATCH 3/3] fuzz: add testcases of recent issues --- test/fuzz/fuzz-network-parser/oss-fuzz-11302 | 2 ++ test/fuzz/fuzz-network-parser/oss-fuzz-11314 | 5 +++++ 2 files changed, 7 insertions(+) create mode 100644 test/fuzz/fuzz-network-parser/oss-fuzz-11302 create mode 100644 test/fuzz/fuzz-network-parser/oss-fuzz-11314 diff --git a/test/fuzz/fuzz-network-parser/oss-fuzz-11302 b/test/fuzz/fuzz-network-parser/oss-fuzz-11302 new file mode 100644 index 0000000000..0ef0dccbd0 --- /dev/null +++ b/test/fuzz/fuzz-network-parser/oss-fuzz-11302 @@ -0,0 +1,2 @@ +[Network] +IPv6MTUBytes=7K \ No newline at end of file diff --git a/test/fuzz/fuzz-network-parser/oss-fuzz-11314 b/test/fuzz/fuzz-network-parser/oss-fuzz-11314 new file mode 100644 index 0000000000..2fb68e9862 --- /dev/null +++ b/test/fuzz/fuzz-network-parser/oss-fuzz-11314 @@ -0,0 +1,5 @@ + +[Network] +IPv6MTUBytes=6M + +Bond=