Merge pull request #10682 from yuwata/fix-oss-fuzz-network-issues

network: fix memleak

src/network/networkd-network.c

@@ -369,6 +369,7 @@ void network_free(Network *network) {
         strv_free(network->search_domains);
         strv_free(network->route_domains);
         strv_free(network->bind_carrier);
+        strv_free(network->router_search_domains);
 
         netdev_unref(network->bridge);
         netdev_unref(network->bond);
@@ -1154,8 +1155,7 @@ int config_parse_radv_search_domains(
         assert(rvalue);
 
         for (;;) {
-                _cleanup_free_ char *w = NULL;
+                _cleanup_free_ char *w = NULL, *idna = NULL;
-                _cleanup_free_ char *idna = NULL;
 
                 r = extract_first_word(&p, &w, NULL, 0);
                 if (r == -ENOMEM)
@@ -1168,11 +1168,15 @@ int config_parse_radv_search_domains(
                         break;
 
                 r = dns_name_apply_idna(w, &idna);
+                if (r < 0) {
+                        log_syntax(unit, LOG_ERR, filename, line, r, "Failed to apply IDNA to domain name '%s', ignoring: %m", w);
+                        continue;
+                }
                 if (r > 0) {
                         r = strv_push(&n->router_search_domains, idna);
                         if (r >= 0)
                                 idna = NULL;
-                } else if (r == 0) {
+                } else {
                         r = strv_push(&n->router_search_domains, w);
                         if (r >= 0)
                                 w = NULL;

test/fuzz/fuzz-network-parser/oss-fuzz-11285

@@ -0,0 +1,2 @@
+[IPv6PrefixDelegation]
+Domains=m