From d2367d775522bb6d7a5f23a759b05b9eda89a89d Mon Sep 17 00:00:00 2001 From: Glenn Washburn Date: Fri, 5 Oct 2018 13:29:10 -0500 Subject: Firejail should look for processes with names exactly named "firejail" to avoid accounting for processes with a "firejail" prefix. --- src/lib/pid.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/lib/pid.c b/src/lib/pid.c index 75576c787..ee1550e57 100644 --- a/src/lib/pid.c +++ b/src/lib/pid.c @@ -359,7 +359,10 @@ void pid_read(pid_t mon_pid) { char buf[PIDS_BUFLEN]; while (fgets(buf, PIDS_BUFLEN - 1, fp)) { if (strncmp(buf, "Name:", 5) == 0) { - char *ptr = buf + 5; + char *ptr = strchr(buf, '\n'); + if (ptr) + *ptr = '\0'; + ptr = buf + 5; while (*ptr != '\0' && (*ptr == ' ' || *ptr == '\t')) { ptr++; } @@ -368,7 +371,7 @@ void pid_read(pid_t mon_pid) { exit(1); } - if ((strncmp(ptr, "firejail", 8) == 0) && (mon_pid == 0 || mon_pid == pid)) { + if ((strcmp(ptr, "firejail") == 0) && (mon_pid == 0 || mon_pid == pid)) { if (pid_proc_cmdline_x11_xpra_xephyr(pid)) pids[pid].level = -1; else -- cgit v1.2.3-70-g09d2