Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-02-28 05:29:59 +00:00
Code Issues Projects Releases Wiki Activity

make find_pid_by_name look at /proc/PID/exe too

Browse Source 
function                                             old     new   delta
procps_scan                                         1642    1709     +67
find_pid_by_name                                     193     223     +30
free_procps_scan                                      29      37      +8

Signed-off-by: Alexander Shishkin <virtuoso@slind.org>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Alexander Shishkin 2009-07-29 01:35:13 +02:00 committed by Denys Vlasenko
parent 09449630fb
commit e766f62132
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/libbb.h
View File

@ -1280,6 +1280,7 @@ typedef struct procps_status_t {
/* Fields are set to 0/NULL if failed to determine (or not requested) */ /* Fields are set to 0/NULL if failed to determine (or not requested) */
uint16_t argv_len; uint16_t argv_len;
char *argv0; char *argv0;
char *exe;
IF_SELINUX(char *context;) IF_SELINUX(char *context;)
/* Everything below must contain no ptrs to malloc'ed data: /* Everything below must contain no ptrs to malloc'ed data:
* it is memset(0) for each process in procps_scan() */ * it is memset(0) for each process in procps_scan() */
@ -1327,7 +1328,7 @@ enum {
PSSCAN_COMM = 1 << 5, PSSCAN_COMM = 1 << 5,
/* PSSCAN_CMD = 1 << 6, - use read_cmdline instead */ /* PSSCAN_CMD = 1 << 6, - use read_cmdline instead */
PSSCAN_ARGV0 = 1 << 7, PSSCAN_ARGV0 = 1 << 7,
/* PSSCAN_EXE = 1 << 8, - not implemented */ PSSCAN_EXE = 1 << 8,
PSSCAN_STATE = 1 << 9, PSSCAN_STATE = 1 << 9,
PSSCAN_VSZ = 1 << 10, PSSCAN_VSZ = 1 << 10,
PSSCAN_RSS = 1 << 11, PSSCAN_RSS = 1 << 11,

22
libbb/find_pid_by_name.c
View File

@ -41,18 +41,20 @@ and therefore comm field contains "exe".
static int comm_match(procps_status_t *p, const char *procName) static int comm_match(procps_status_t *p, const char *procName)
{ {
int argv1idx; int argv1idx;
const char *argv1;
/* comm does not match */
if (strncmp(p->comm, procName, 15) != 0) if (strncmp(p->comm, procName, 15) != 0)
return 0; return 0; /* comm does not match */
/* in Linux, if comm is 15 chars, it may be a truncated */ /* In Linux, if comm is 15 chars, it is truncated.
if (p->comm[14] == '\0') /* comm is not truncated - match */ * (or maybe the name was exactly 15 chars, but there is
return 1; * no way to know that) */
if (p->comm[14] == '\0')
return 1; /* comm is not truncated - matches */
/* comm is truncated, but first 15 chars match. /* comm is truncated, but first 15 chars match.
* This can be crazily_long_script_name.sh! * This can be crazily_long_script_name.sh!
* The telltale sign is basename(argv[1]) == procName. */ * The telltale sign is basename(argv[1]) == procName */
if (!p->argv0) if (!p->argv0)
return 0; return 0;
@ -60,8 +62,9 @@ static int comm_match(procps_status_t *p, const char *procName)
argv1idx = strlen(p->argv0) + 1; argv1idx = strlen(p->argv0) + 1;
if (argv1idx >= p->argv_len) if (argv1idx >= p->argv_len)
return 0; return 0;
argv1 = p->argv0 + argv1idx;
if (strcmp(bb_basename(p->argv0 + argv1idx), procName) != 0) if (strcmp(bb_basename(argv1), procName) != 0)
return 0; return 0;
return 1; return 1;
@ -83,11 +86,12 @@ pid_t* FAST_FUNC find_pid_by_name(const char *procName)
procps_status_t* p = NULL; procps_status_t* p = NULL;
pidList = xzalloc(sizeof(*pidList)); pidList = xzalloc(sizeof(*pidList));
while ((p = procps_scan(p, PSSCAN_PID|PSSCAN_COMM|PSSCAN_ARGVN))) { while ((p = procps_scan(p, PSSCAN_PID|PSSCAN_COMM|PSSCAN_ARGVN|PSSCAN_EXE))) {
if (comm_match(p, procName) if (comm_match(p, procName)
/* or we require argv0 to match (essential for matching reexeced /proc/self/exe)*/ /* or we require argv0 to match (essential for matching reexeced /proc/self/exe)*/
|| (p->argv0 && strcmp(bb_basename(p->argv0), procName) == 0) || (p->argv0 && strcmp(bb_basename(p->argv0), procName) == 0)
/* TODO: we can also try /proc/NUM/exe link, do we want that? */ /* or we require /proc/PID/exe link to match */
|| (p->exe && strcmp(bb_basename(p->exe), procName) == 0)
) { ) {
pidList = xrealloc_vector(pidList, 2, i); pidList = xrealloc_vector(pidList, 2, i);
pidList[i++] = p->pid; pidList[i++] = p->pid;

18
libbb/procps.c
View File

@ -111,6 +111,7 @@ void FAST_FUNC free_procps_scan(procps_status_t* sp)
{ {
closedir(sp->dir); closedir(sp->dir);
free(sp->argv0); free(sp->argv0);
free(sp->exe);
IF_SELINUX(free(sp->context);) IF_SELINUX(free(sp->context);)
free(sp); free(sp);
} }
@ -213,7 +214,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
} }
#endif #endif
filename_tail = filename + sprintf(filename, "/proc/%d", pid); filename_tail = filename + sprintf(filename, "/proc/%u/", pid);
if (flags & PSSCAN_UIDGID) { if (flags & PSSCAN_UIDGID) {
if (stat(filename, &sb)) if (stat(filename, &sb))
@ -230,7 +231,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
unsigned long vsz, rss; unsigned long vsz, rss;
#endif #endif
/* see proc(5) for some details on this */ /* see proc(5) for some details on this */
strcpy(filename_tail, "/stat"); strcpy(filename_tail, "stat");
n = read_to_buf(filename, buf); n = read_to_buf(filename, buf);
if (n < 0) if (n < 0)
break; break;
@ -340,7 +341,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
if (flags & (PSSCAN_SMAPS)) { if (flags & (PSSCAN_SMAPS)) {
FILE *file; FILE *file;
strcpy(filename_tail, "/smaps"); strcpy(filename_tail, "smaps");
file = fopen_for_read(filename); file = fopen_for_read(filename);
if (!file) if (!file)
break; break;
@ -390,7 +391,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
if (flags & PSSCAN_RUIDGID) { if (flags & PSSCAN_RUIDGID) {
FILE *file; FILE *file;
strcpy(filename_tail, "/status"); strcpy(filename_tail, "status");
file = fopen_for_read(filename); file = fopen_for_read(filename);
if (!file) if (!file)
break; break;
@ -415,7 +416,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
sp->argv0 = NULL; sp->argv0 = NULL;
free(sp->cmd); free(sp->cmd);
sp->cmd = NULL; sp->cmd = NULL;
strcpy(filename_tail, "/cmdline"); strcpy(filename_tail, "cmdline");
/* TODO: to get rid of size limits, read into malloc buf, /* TODO: to get rid of size limits, read into malloc buf,
* then realloc it down to real size. */ * then realloc it down to real size. */
n = read_to_buf(filename, buf); n = read_to_buf(filename, buf);
@ -436,7 +437,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
if (flags & (PSSCAN_ARGV0|PSSCAN_ARGVN)) { if (flags & (PSSCAN_ARGV0|PSSCAN_ARGVN)) {
free(sp->argv0); free(sp->argv0);
sp->argv0 = NULL; sp->argv0 = NULL;
strcpy(filename_tail, "/cmdline"); strcpy(filename_tail, "cmdline");
n = read_to_buf(filename, buf); n = read_to_buf(filename, buf);
if (n <= 0) if (n <= 0)
break; break;
@ -451,6 +452,11 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
} }
} }
#endif #endif
if (flags & PSSCAN_EXE) {
strcpy(filename_tail, "exe");
free(sp->exe);
sp->exe = xmalloc_readlink(filename);
}
break; break;
} }
return sp; return sp;