shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

core/service: modernize service_load_pid_file() a bit

Browse Source
This commit is contained in:
Mike Yuan 2024-08-30 22:54:14 +02:00
parent 0ec3d45bcc
commit 7e6ef4340b
No known key found for this signature in database
GPG Key ID: 417471C0A40F58B3
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/core/service.c
View File

@ -1130,42 +1130,37 @@ static int service_is_suitable_main_pid(Service *s, PidRef *pid, int prio) {
static int service_load_pid_file(Service *s, bool may_warn) { static int service_load_pid_file(Service *s, bool may_warn) {
_cleanup_(pidref_done) PidRef pidref = PIDREF_NULL; _cleanup_(pidref_done) PidRef pidref = PIDREF_NULL;
bool questionable_pid_file = false; _cleanup_fclose_ FILE *f = NULL;
_cleanup_free_ char *k = NULL; _cleanup_free_ char *k = NULL;
_cleanup_close_ int fd = -EBADF; bool questionable_pid_file = false;
int r, prio; int r, prio = may_warn ? LOG_INFO : LOG_DEBUG;
assert(s); assert(s);
if (!s->pid_file) if (!s->pid_file)
return -ENOENT; return -ENOENT;
prio = may_warn ? LOG_INFO : LOG_DEBUG; r = chase_and_fopen_unlocked(s->pid_file, NULL, CHASE_SAFE, "re", NULL, &f);
r = chase(s->pid_file, NULL, CHASE_SAFE, NULL, &fd);
if (r == -ENOLINK) { if (r == -ENOLINK) {
log_unit_debug_errno(UNIT(s), r, log_unit_debug_errno(UNIT(s), r,
"Potentially unsafe symlink chain, will now retry with relaxed checks: %s", s->pid_file); "Potentially unsafe symlink chain, will now retry with relaxed checks: %s", s->pid_file);
questionable_pid_file = true; questionable_pid_file = true;
r = chase(s->pid_file, NULL, 0, NULL, &fd); r = chase_and_fopen_unlocked(s->pid_file, NULL, 0, "re", NULL, &f);
} }
if (r < 0) if (r < 0)
return log_unit_full_errno(UNIT(s), prio, r, return log_unit_full_errno(UNIT(s), prio, r,
"Can't open PID file %s (yet?) after %s: %m", s->pid_file, service_state_to_string(s->state)); "Can't open PID file '%s' (yet?) after %s: %m", s->pid_file, service_state_to_string(s->state));
/* Let's read the PID file now that we chased it down. But we need to convert the O_PATH fd /* Let's read the PID file now that we chased it down. */
* chase() returned us into a proper fd first. */ r = read_line(f, LINE_MAX, &k);
r = read_one_line_file(FORMAT_PROC_FD_PATH(fd), &k);
if (r < 0) if (r < 0)
return log_unit_error_errno(UNIT(s), r, return log_unit_error_errno(UNIT(s), r, "Failed to read PID file '%s': %m", s->pid_file);
"Can't convert PID files %s O_PATH file descriptor to proper file descriptor: %m",
s->pid_file);
r = pidref_set_pidstr(&pidref, k); r = pidref_set_pidstr(&pidref, k);
if (r < 0) if (r < 0)
return log_unit_full_errno(UNIT(s), prio, r, "Failed to parse PID from file %s: %m", s->pid_file); return log_unit_full_errno(UNIT(s), prio, r, "Failed to create reference to PID %s from file '%s': %m", k, s->pid_file);
if (s->main_pid_known && pidref_equal(&pidref, &s->main_pid)) if (s->main_pid_known && pidref_equal(&pidref, &s->main_pid))
return 0; return 0;
@ -1182,14 +1177,14 @@ static int service_load_pid_file(Service *s, bool may_warn) {
/* Hmm, it's not clear if the new main PID is safe. Let's allow this if the PID file is owned by root */ /* Hmm, it's not clear if the new main PID is safe. Let's allow this if the PID file is owned by root */
if (fstat(fd, &st) < 0) if (fstat(fileno(f), &st) < 0)
return log_unit_error_errno(UNIT(s), errno, "Failed to fstat() PID file O_PATH fd: %m"); return log_unit_error_errno(UNIT(s), errno, "Failed to fstat() PID file '%s': %m", s->pid_file);
if (st.st_uid != 0) if (st.st_uid != 0)
return log_unit_error_errno(UNIT(s), SYNTHETIC_ERRNO(EPERM), return log_unit_error_errno(UNIT(s), SYNTHETIC_ERRNO(EPERM),
"New main PID "PID_FMT" does not belong to service, and PID file is not owned by root. Refusing.", pidref.pid); "New main PID "PID_FMT" from PID file does not belong to service, and PID file is not owned by root. Refusing.", pidref.pid);
log_unit_debug(UNIT(s), "New main PID "PID_FMT" does not belong to service, but we'll accept it since PID file is owned by root.", pidref.pid); log_unit_debug(UNIT(s), "New main PID "PID_FMT" does not belong to service, accepting anyway since PID file is owned by root.", pidref.pid);
} }
if (s->main_pid_known) { if (s->main_pid_known) {