* Nils Carlson ([email protected]) wrote: > Allow root (geteuid() == 0) see all pids. This way the super-user > can connect to any program. A step on the way of carefully outlining > what UST does and doesn't.
Please note that I'm also fine with doing pid == 0 as an initial step, and to only bring in the "tracing" group in a second stage. > > Signed-off-by: Nils Carlson <[email protected]> > --- > libustcomm/ustcomm.h | 4 ++- > libustctl/libustctl.c | 60 > ++++++++++++++++++++++++++++++++++++++++++++++++- > 2 files changed, 62 insertions(+), 2 deletions(-) > > diff --git a/libustcomm/ustcomm.h b/libustcomm/ustcomm.h > index 137fe5b..84ac8e0 100644 > --- a/libustcomm/ustcomm.h > +++ b/libustcomm/ustcomm.h > @@ -25,7 +25,9 @@ > #include <ust/kcompat/kcompat.h> > > #define SOCK_DIR "/tmp/ust-app-socks" > -#define USER_SOCK_DIR "/tmp/ust-socks-" > +#define USER_TMP_DIR "/tmp" > +#define USER_SOCK_DIR_BASE "ust-socks-" > +#define USER_SOCK_DIR USER_TMP_DIR "/" USER_SOCK_DIR_BASE > > struct ustcomm_sock { > struct cds_list_head list; > diff --git a/libustctl/libustctl.c b/libustctl/libustctl.c > index 2453a99..861db05 100644 > --- a/libustctl/libustctl.c > +++ b/libustctl/libustctl.c > @@ -120,7 +120,7 @@ static void get_pids_in_dir(DIR *dir, pid_t **pid_list, > (*pid_list)[i] = 0; /* Array end */ > } > Please document that the caller must free the returned pid_t. > -pid_t *ustctl_get_online_pids(void) > +pid_t *get_pids_non_root(void) > { > char *dir_name; > DIR *dir; > @@ -138,6 +138,9 @@ pid_t *ustctl_get_online_pids(void) > } > > pid_list = (pid_t *) malloc(pid_list_size); > + if (!pid_list) { > + goto close_dir; > + } > > get_pids_in_dir(dir, &pid_list, &pid_list_size); > > @@ -157,6 +160,61 @@ free_dir_name: > return pid_list; > } > Same here. > +pid_t *get_pids_root(void) > +{ > + char *dir_name; > + DIR *tmp_dir, *dir; > + unsigned int pid_list_size = sizeof(pid_t); > + pid_t *pid_list = NULL; > + struct dirent *dirent; > + > + tmp_dir = opendir(USER_TMP_DIR); > + if (!tmp_dir) { > + return NULL; > + } > + > + pid_list = (pid_t *)malloc(pid_list_size); > + if (!pid_list) { > + goto close_tmp_dir; > + } > + > + while ((dirent = readdir(tmp_dir))) { > + if (!strncmp(dirent->d_name, USER_SOCK_DIR_BASE, > + strlen(USER_SOCK_DIR_BASE))) { > + > + if (asprintf(&dir_name, USER_TMP_DIR "/%s", > dirent->d_name) < 0) { > + goto close_tmp_dir; > + } > + > + dir = opendir(dir_name); > + > + free(dir_name); > + > + if (!dir) { > + continue; > + } > + > + get_pids_in_dir(dir, &pid_list, &pid_list_size); > + > + closedir(dir); > + } > + } > + > +close_tmp_dir: > + closedir(tmp_dir); > + > + return pid_list; > +} > + And here. Thanks, Mathieu > +pid_t *ustctl_get_online_pids(void) > +{ > + if (geteuid()) { > + return get_pids_non_root(); > + } else { > + return get_pids_root(); > + } > +} > + > /** > * Sets marker state (USTCTL_MS_ON or USTCTL_MS_OFF). > * > -- > 1.7.1 > > > _______________________________________________ > ltt-dev mailing list > [email protected] > http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev > -- Mathieu Desnoyers Operating System Efficiency R&D Consultant EfficiOS Inc. http://www.efficios.com _______________________________________________ ltt-dev mailing list [email protected] http://lists.casi.polymtl.ca/cgi-bin/mailman/listinfo/ltt-dev
