From 3c8c67ce1d3f132208927d65f8b6ac068e0233cf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 9 Aug 2023 16:43:28 +0200 Subject: [PATCH] shared/cgroup-show: do not format path twice Also, invert the "negative" condition to positive so that it matches the assert right above. Also, print the path in the debug message. --- src/shared/cgroup-show.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/shared/cgroup-show.c b/src/shared/cgroup-show.c index 0fd8d73303d..d2d03399108 100644 --- a/src/shared/cgroup-show.c +++ b/src/shared/cgroup-show.c @@ -134,21 +134,23 @@ static int is_delegated(int cgfd, const char *path) { assert(cgfd >= 0 || path); - r = getxattr_malloc(cgfd < 0 ? path : FORMAT_PROC_FD_PATH(cgfd), "trusted.delegate", &b); + const char *t = cgfd >= 0 ? FORMAT_PROC_FD_PATH(cgfd) : path; + + r = getxattr_malloc(t, "trusted.delegate", &b); if (ERRNO_IS_NEG_XATTR_ABSENT(r)) { /* If the trusted xattr isn't set (preferred), then check the untrusted one. Under the * assumption that whoever is trusted enough to own the cgroup, is also trusted enough to * decide if it is delegated or not this should be safe. */ - r = getxattr_malloc(cgfd < 0 ? path : FORMAT_PROC_FD_PATH(cgfd), "user.delegate", &b); + r = getxattr_malloc(t, "user.delegate", &b); if (ERRNO_IS_NEG_XATTR_ABSENT(r)) return false; } if (r < 0) - return log_debug_errno(r, "Failed to read delegate xattr, ignoring: %m"); + return log_debug_errno(r, "Failed to read delegate xattr from %s, ignoring: %m", t); r = parse_boolean(b); if (r < 0) - return log_debug_errno(r, "Failed to parse delegate xattr boolean value, ignoring: %m"); + return log_debug_errno(r, "Failed to parse delegate xattr from %s, ignoring: %m", t); return r; } -- 2.47.3