emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pstree: stop truncating thread names

Browse Source 
This also fixes a minor buffer overflow when displaying threads as
add_proc() only expects COMM_LEN bytes, but we give it one more than
that.

Reported-by: Dag Wieers <dag@wieers.com>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2013-06-19 11:29:57 -04:00
parent 5a7e3376b7
commit fea2588021
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
procps/pstree.c
View File

@ -34,8 +34,15 @@
struct child; struct child;
#ifdef ENABLE_FEATURE_SHOW_THREADS
/* For threads, we add {...} around the comm, so we need two extra bytes */
# define COMM_DISP_LEN (COMM_LEN + 2)
#else
# define COMM_DISP_LEN COMM_LEN
#endif
typedef struct proc { typedef struct proc {
char comm[COMM_LEN + 1]; char comm[COMM_DISP_LEN + 1];
// char flags; - unused, delete? // char flags; - unused, delete?
pid_t pid; pid_t pid;
uid_t uid; uid_t uid;
@ -341,8 +348,8 @@ static void dump_by_user(PROC *current, uid_t uid)
#if ENABLE_FEATURE_SHOW_THREADS #if ENABLE_FEATURE_SHOW_THREADS
static void handle_thread(const char *comm, pid_t pid, pid_t ppid, uid_t uid) static void handle_thread(const char *comm, pid_t pid, pid_t ppid, uid_t uid)
{ {
char threadname[COMM_LEN + 2]; char threadname[COMM_DISP_LEN + 1];
sprintf(threadname, "{%.*s}", COMM_LEN - 2, comm); sprintf(threadname, "{%.*s}", (int)sizeof(threadname) - 1, comm);
add_proc(threadname, pid, ppid, uid/*, 1*/); add_proc(threadname, pid, ppid, uid/*, 1*/);
} }
#endif #endif