From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 4 Oct 2021 09:26:24 +0000 (+0900)
Subject: network: do not ignore critical errors like OOM
X-Git-Tag: v250-rc1~570^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9202b567bcdd0c1f6a1fc2a5f36602e619960813;p=thirdparty%2Fsystemd.git

network: do not ignore critical errors like OOM
---

diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c
index 358bbf5b5e9..7611476ad66 100644
--- a/src/network/networkd-network.c
+++ b/src/network/networkd-network.c
@@ -535,14 +535,17 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi
 
         r = network_add_ipv4ll_route(network);
         if (r < 0)
-                log_warning_errno(r, "%s: Failed to add IPv4LL route, ignoring: %m", network->filename);
+                return log_warning_errno(r, "%s: Failed to add IPv4LL route: %m", network->filename);
 
         r = network_add_default_route_on_device(network);
         if (r < 0)
-                log_warning_errno(r, "%s: Failed to add default route on device, ignoring: %m",
-                                  network->filename);
+                return log_warning_errno(r, "%s: Failed to add default route on device: %m",
+                                         network->filename);
 
-        if (network_verify(network) < 0)
+        r = network_verify(network);
+        if (r == -ENOMEM)
+                return r;
+        if (r < 0)
                 /* Ignore .network files that do not match the conditions. */
                 return 0;
 
@@ -570,7 +573,7 @@ int network_load(Manager *manager, OrderedHashmap **networks) {
         STRV_FOREACH(f, files) {
                 r = network_load_one(manager, networks, *f);
                 if (r < 0)
-                        log_error_errno(r, "Failed to load %s, ignoring: %m", *f);
+                        return log_error_errno(r, "Failed to load %s: %m", *f);
         }
 
         return 0;