From: David Tardon <dtardon@redhat.com>
Date: Tue, 7 May 2024 11:35:55 +0000 (+0200)
Subject: userns-restrict: pass the right error variable
X-Git-Tag: v256-rc2~83^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3613a1d49f7847bd20906cc3b45e959b54f91366;p=thirdparty%2Fsystemd.git

userns-restrict: pass the right error variable
---

diff --git a/src/nsresourced/userns-restrict.c b/src/nsresourced/userns-restrict.c
index 4e917fd7586..241a655e62d 100644
--- a/src/nsresourced/userns-restrict.c
+++ b/src/nsresourced/userns-restrict.c
@@ -218,7 +218,7 @@ int userns_restrict_put_by_inode(
 
                 r = sym_bpf_map_update_elem(outer_map_fd, &ino, &inner_map_fd, BPF_ANY);
                 if (r < 0)
-                        return log_debug_errno(errno, "Failed to replace map in inode hash: %m");
+                        return log_debug_errno(r, "Failed to replace map in inode hash: %m");
         } else {
                 /* Let's add an entry for this userns inode if missing. If it exists just extend the existing map. We
                  * might race against each other, hence we try a couple of times */
@@ -258,7 +258,7 @@ int userns_restrict_put_by_inode(
 
                 r = sym_bpf_map_update_elem(inner_map_fd, mntid, &dummy_value, BPF_ANY);
                 if (r < 0)
-                        return log_debug_errno(errno, "Failed to add mount ID to map: %m");
+                        return log_debug_errno(r, "Failed to add mount ID to map: %m");
 
                 log_debug("Allowing mount %i on userns inode %" PRIu64, *mntid, ino);
         }
@@ -318,7 +318,7 @@ int userns_restrict_reset_by_inode(
 
         r = sym_bpf_map_delete_elem(outer_map_fd, &u);
         if (r < 0)
-                return log_debug_errno(outer_map_fd, "Failed to remove entry for inode %" PRIu64 " from outer map: %m", ino);
+                return log_debug_errno(r, "Failed to remove entry for inode %" PRIu64 " from outer map: %m", ino);
 
         return 0;
 }