Merge pull request #12016 from yuwata/fix-two-memleaks-found-by-oss-fuzz

Fix two memleaks found by oss fuzz

src/network/netdev/l2tp-tunnel.c

@@ -629,9 +629,9 @@ int config_parse_l2tp_session_name(
                 return 0;
         }
 
-        session->name = strdup(rvalue);
-        if (!session->name)
-                return -ENOMEM;
+        r = free_and_strdup(&session->name, rvalue);
+        if (r < 0)
+                return log_oom();
 
         session = NULL;
         return 0;

src/network/netdev/wireguard.c

@@ -758,12 +758,12 @@ int config_parse_wireguard_endpoint(const char *unit,
                 ++end;
         }
 
-        peer->endpoint_host = strndup(begin, len);
-        if (!peer->endpoint_host)
+        r = free_and_strndup(&peer->endpoint_host, begin, len);
+        if (r < 0)
                 return log_oom();
 
-        peer->endpoint_port = strdup(end);
-        if (!peer->endpoint_port)
+        r = free_and_strdup(&peer->endpoint_port, end);
+        if (r < 0)
                 return log_oom();
 
         r = set_ensure_allocated(&w->peers_with_unresolved_endpoint, NULL);

src/nspawn/nspawn-mount.c

@@ -304,7 +304,7 @@ int overlay_mount_parse(CustomMount **l, size_t *n, const char *s, bool read_onl
                 /* If the upper directory is unspecified, then let's create it automatically as a throw-away directory
                  * in /var/tmp */
                 if (isempty(upper))
-                        upper = NULL;
+                        upper = mfree(upper);
                 else if (!source_path_is_valid(upper))
                         return -EINVAL;
 

test/fuzz/fuzz-netdev-parser/oss-fuzz-13719

@@ -0,0 +1,6 @@
+[NetDev]
+Name=w
+Kind=wireguard
+[WireGuardPeer]
+Endpoint=:0
+Endpoint=:8

test/fuzz/fuzz-nspawn-settings/oss-fuzz-13691

@@ -0,0 +1,2 @@
+[Files]
+Overlay=/::