system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-14 20:18:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge: branch 'jv/no-pid-upper-bound'

Browse source 
main: increase upper limit of pid when checking pidfile

https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1727
This commit is contained in:
Beniamino Galvani 2023-10-03 06:25:41 +00:00
parent ffc377ecc6 50f34217f9
commit fa1239df14
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/core/main-utils.c
View file

@ -158,7 +158,8 @@ nm_main_utils_ensure_not_running_pidfile(const char *pidfile)
gs_free char *contents = NULL;
gs_free char *proc_cmdline = NULL;
gsize len = 0;
long pid;
pid_t pid;
gint64 pid64;
const char *process_name;
const char *prgname = g_get_prgname();
@ -173,12 +174,13 @@ nm_main_utils_ensure_not_running_pidfile(const char *pidfile)
return;
errno = 0;
pid = strtol(contents, NULL, 10);
if (pid <= 0 || pid > 65536 || errno)
pid64 = _nm_utils_ascii_str_to_int64(contents, 10, 0, G_MAXINT64, -1);
pid = (pid_t) pid64;
if (pid <= 0 || (gint64) pid != pid64)
return;
nm_clear_g_free(&contents);
proc_cmdline = g_strdup_printf("/proc/%ld/cmdline", pid);
proc_cmdline = g_strdup_printf("/proc/%" G_GINT64_FORMAT "/cmdline", (gint64) pid);
if (!g_file_get_contents(proc_cmdline, &contents, &len, NULL))
return;
@ -190,7 +192,10 @@ nm_main_utils_ensure_not_running_pidfile(const char *pidfile)
if (strcmp(process_name, prgname) == 0) {
/* Check that the process exists */
if (kill(pid, 0) == 0) {
fprintf(stderr, _("%s is already running (pid %ld)\n"), prgname, pid);
fprintf(stderr,
_("%s is already running (pid %" G_GINT64_FORMAT ")\n"),
prgname,
(gint64) pid);
exit(1);
}
}