--- plugins/check_procs.c.orig 2022-10-19 12:50:27 UTC +++ plugins/check_procs.c @@ -70,6 +70,7 @@ int options = 0; /* bitmask of filter criteria to test #define PCPU 256 #define ELAPSED 512 #define EREG_ARGS 1024 +#define JID 2048 #define KTHREAD_PARENT "kthreadd" /* the parent process of kernel threads: ppid of procs are compared to pid of this proc*/ @@ -101,6 +102,7 @@ int usepid = 0; /* whether to test for pid or /proc/pi char tmp[MAX_INPUT_BUFFER]; int kthread_filter = 0; int usepid = 0; /* whether to test for pid or /proc/pid/exe */ +int jid; FILE *ps_input = NULL; @@ -130,6 +132,7 @@ main (int argc, char **argv) int procuid = 0; pid_t procpid = 0; pid_t procppid = 0; + int procjid = 0; pid_t kthread_ppid = 0; int procvsz = 0; int procrss = 0; @@ -230,9 +233,9 @@ main (int argc, char **argv) procseconds = convert_to_seconds(procetime); if (verbose >= 3) - printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", + printf ("proc#=%d uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", procs, procuid, procvsz, procrss, - procpid, procppid, procpcpu, procstat, + procpid, procppid, procjid, procpcpu, procstat, procetime, procprog, procargs); /* Ignore self */ @@ -275,6 +278,8 @@ main (int argc, char **argv) resultsum |= PROG; if ((options & PPID) && (procppid == ppid)) resultsum |= PPID; + if ((options & JID) && (procjid == jid)) + resultsum |= JID; if ((options & USER) && (procuid == uid)) resultsum |= USER; if ((options & VSZ) && (procvsz >= vsz)) @@ -292,9 +297,9 @@ main (int argc, char **argv) procs++; if (verbose >= 2) { - printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", + printf ("Matched: uid=%d vsz=%d rss=%d pid=%d ppid=%d jid=%d pcpu=%.2f stat=%s etime=%s prog=%s args=%s\n", procuid, procvsz, procrss, - procpid, procppid, procpcpu, procstat, + procpid, procppid, procjid, procpcpu, procstat, procetime, procprog, procargs); } @@ -409,6 +414,7 @@ process_arguments (int argc, char **argv) {"input-file", required_argument, 0, CHAR_MAX+2}, {"no-kthreads", required_argument, 0, 'k'}, {"traditional-filter", no_argument, 0, 'T'}, + {"jid", required_argument, 0, 'j'}, {0, 0, 0, 0} }; @@ -417,7 +423,7 @@ process_arguments (int argc, char **argv) strcpy (argv[c], "-t"); while (1) { - c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:T", + c = getopt_long (argc, argv, "Vvhkt:c:w:p:s:u:C:a:z:r:m:P:Tj:", longopts, &option); if (c == -1 || c == EOF) @@ -451,6 +457,12 @@ process_arguments (int argc, char **argv) break; } usage4 (_("Parent Process ID must be an integer!")); + case 'j': /* jail id */ + if (sscanf (optarg, "%d%[^0-9]", &jid, tmp) == 1) { + asprintf (&fmt, "%s%sJID = %d", (fmt ? fmt : "") , (options ? ", " : ""), jid); + options |= JID; + break; + } case 's': /* status */ if (statopts) break; @@ -731,6 +743,8 @@ print_help (void) printf (" %s\n", _("RSZDT, plus others based on the output of your 'ps' command).")); printf (" %s\n", "-p, --ppid=PPID"); printf (" %s\n", _("Only scan for children of the parent process ID indicated.")); + printf (" %s\n", "-j, --jid=JID"); + printf (" %s\n", _("Only scan for process running in jail which ID is JID.")); printf (" %s\n", "-z, --vsz=VSZ"); printf (" %s\n", _("Only scan for processes with VSZ higher than indicated.")); printf (" %s\n", "-r, --rss=RSS"); @@ -784,7 +798,7 @@ print_usage (void) print_usage (void) { printf ("%s\n", _("Usage:")); - printf ("%s -w -c [-m metric] [-s state] [-p ppid]\n", progname); + printf ("%s -w -c [-m metric] [-s state] [-p ppid] [-j jid]\n", progname); printf (" [-u user] [-r rss] [-z vsz] [-P %%cpu] [-a argument-array]\n"); printf (" [-C command] [-k] [-t timeout] [-v]\n"); }