]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
bpf: Fix error handling 22757/head
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 15 Mar 2022 17:14:19 +0000 (17:14 +0000)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Tue, 15 Mar 2022 17:14:19 +0000 (17:14 +0000)
The __open() functions actually set errno on failure so let's
update the error handling to account for that.

src/core/bpf-socket-bind.c
src/core/restrict-ifaces.c

index c5176aa481a45289ff2d4f9e082b2eeb9c3a5660..806df84ea725f0f2746f85141b16752fbfcc6006 100644 (file)
@@ -78,8 +78,7 @@ static int prepare_socket_bind_bpf(
 
         obj = socket_bind_bpf__open();
         if (!obj)
-                return log_unit_full_errno(u, u ? LOG_ERR : LOG_DEBUG, SYNTHETIC_ERRNO(ENOMEM),
-                                           "Failed to open BPF object");
+                return log_unit_full_errno(u, u ? LOG_ERR : LOG_DEBUG, errno, "Failed to open BPF object: %m");
 
         if (sym_bpf_map__resize(obj->maps.sd_bind_allow, MAX(allow_count, 1u)) != 0)
                 return log_unit_full_errno(u, u ? LOG_ERR : LOG_WARNING, errno,
index 00dc429078904e16882e52f3b0a8419e1ae35074..efa5c8d85abcdbfd977b39b454b68d5d1dfb9e85 100644 (file)
@@ -34,8 +34,7 @@ static int prepare_restrict_ifaces_bpf(
 
         obj = restrict_ifaces_bpf__open();
         if (!obj)
-                return log_unit_full_errno(u, u ? LOG_ERR : LOG_DEBUG,
-                                           SYNTHETIC_ERRNO(ENOMEM), "Failed to open BPF object");
+                return log_unit_full_errno(u, u ? LOG_ERR : LOG_DEBUG, errno, "Failed to open BPF object: %m");
 
         r = sym_bpf_map__resize(obj->maps.sd_restrictif, MAX(set_size(restrict_network_interfaces), 1u));
         if (r != 0)