File 0041-Fix-three-uses-of-bogus-errno-value-in-log... of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File 0041-Fix-three-uses-of-bogus-errno-value-in-logs-and-retu.patch of Package systemd (Revision a47769d8fb254159c07462a5675e1695)

Currently displaying revision a47769d8fb254159c07462a5675e1695 , Show latest

From 6852fe9147ff6948277aa96928fd94b1edbc9d00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 24 Apr 2018 13:45:44 +0200
Subject: [PATCH 41/51] Fix three uses of bogus errno value in logs (and
 returned value in one case)

(cherry picked from commit 4355f1c9da0843708426f5c2c8b85179b934a5c7)

[fbui: dropped changes in src/activate/activate.c]
---
 src/core/bpf-firewall.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/core/bpf-firewall.c b/src/core/bpf-firewall.c
index d91acade35..15ecf55b71 100644
--- a/src/core/bpf-firewall.c
+++ b/src/core/bpf-firewall.c
@@ -704,13 +704,14 @@ int bpf_firewall_supported(void) {
                          1,
                          BPF_F_NO_PREALLOC);
         if (fd < 0) {
-                log_debug_errno(r, "Can't allocate BPF LPM TRIE map, BPF firewalling is not supported: %m");
+                log_debug_errno(fd, "Can't allocate BPF LPM TRIE map, BPF firewalling is not supported: %m");
                 return supported = BPF_FIREWALL_UNSUPPORTED;
         }
 
         safe_close(fd);
 
-        if (bpf_program_new(BPF_PROG_TYPE_CGROUP_SKB, &program) < 0) {
+        r = bpf_program_new(BPF_PROG_TYPE_CGROUP_SKB, &program);
+        if (r < 0) {
                 log_debug_errno(r, "Can't allocate CGROUP SKB BPF program, BPF firewalling is not supported: %m");
                 return supported = BPF_FIREWALL_UNSUPPORTED;
         }
-- 
2.16.4

Places

File 0041-Fix-three-uses-of-bogus-errno-value-in-logs-and-retu.patch of Package systemd (Revision a47769d8fb254159c07462a5675e1695)

Places