picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

journald: make use of fd_get_path() where appropriate

Browse source
This commit is contained in:
Lennart Poettering 2018-03-26 13:27:26 +02:00
parent d9b50610e4
commit cf852ff63b
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/journal/journald-native.c
View file

@ -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;
}