OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qsd: Unlink absolute PID file path

Browse Source 
After writing the PID file, we register an atexit() handler to unlink it
when the process terminates.  However, if the process has changed its
working directory in the meantime (e.g. in os_setup_post() when
daemonizing), this will not work when the PID file path was relative.
Therefore, pass the absolute path (created with realpath()) to the
unlink() call in the atexit() handler.

(realpath() needs a path pointing to an existing file, so we cannot use
it before qemu_write_pidfile().)

Reproducer:
$ cd /tmp
$ qemu-storage-daemon --daemonize --pidfile qsd.pid
$ file qsd.pid
qsd.pid: ASCII text
$ kill $(cat qsd.pid)
$ file qsd.pid
qsd.pid: ASCII text

(qsd.pid should be gone after the process has terminated.)

Buglink: https://bugzilla.redhat.com/show_bug.cgi?id=2092322
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20220609122701.17172-2-hreitz@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Hanna Reitz 2022-06-09 14:26:59 +02:00
parent 9907dba91d
commit 9d8f8233b9
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
storage-daemon/qemu-storage-daemon.c
View File

@ -61,6 +61,7 @@
#include "trace/control.h" #include "trace/control.h"
static const char *pid_file; static const char *pid_file;
static char *pid_file_realpath;
static volatile bool exit_requested = false; static volatile bool exit_requested = false;
void qemu_system_killed(int signal, pid_t pid) void qemu_system_killed(int signal, pid_t pid)
@ -363,7 +364,7 @@ static void process_options(int argc, char *argv[], bool pre_init_pass)
static void pid_file_cleanup(void) static void pid_file_cleanup(void)
{ {
unlink(pid_file); unlink(pid_file_realpath);
} }
static void pid_file_init(void) static void pid_file_init(void)
@ -379,6 +380,14 @@ static void pid_file_init(void)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
pid_file_realpath = g_malloc(PATH_MAX);
if (!realpath(pid_file, pid_file_realpath)) {
error_report("cannot resolve PID file path: %s: %s",
pid_file, strerror(errno));
unlink(pid_file);
exit(EXIT_FAILURE);
}
atexit(pid_file_cleanup); atexit(pid_file_cleanup);
} }