summaryrefslogtreecommitdiff
path: root/src/journal/journald-native.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-03-26 13:27:26 +0200
committerLennart Poettering <lennart@poettering.net>2018-03-28 22:04:58 +0200
commitcf852ff63b70537bf0e72654381694c6aee97f77 (patch)
tree0d28499c6ed3af91e09061af334e09ec426b648b /src/journal/journald-native.c
parentd9b50610e4e5b3f91b22030506477d8a4aa7ee63 (diff)
downloadsystemd-cf852ff63b70537bf0e72654381694c6aee97f77.tar.gz
journald: make use of fd_get_path() where appropriate
Diffstat (limited to 'src/journal/journald-native.c')
-rw-r--r--src/journal/journald-native.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/journal/journald-native.c b/src/journal/journald-native.c
index cee873215d..6b429bc2c7 100644
--- a/src/journal/journald-native.c
+++ b/src/journal/journald-native.c
@@ -343,20 +343,15 @@ void server_process_native_file(
sealed = memfd_get_sealed(fd) > 0;
if (!sealed && (!ucred || ucred->uid != 0)) {
- _cleanup_free_ char *sl = NULL, *k = NULL;
+ _cleanup_free_ char *k = NULL;
const char *e;
/* If this is not a sealed memfd, and the peer is unknown or
* unprivileged, then verify the path. */
- if (asprintf(&sl, "/proc/self/fd/%i", fd) < 0) {
- log_oom();
- return;
- }
-
- r = readlink_malloc(sl, &k);
+ r = fd_get_path(fd, &k);
if (r < 0) {
- log_error_errno(r, "readlink(%s) failed: %m", sl);
+ log_error_errno(r, "readlink(/proc/self/fd/%i) failed: %m", fd);
return;
}