emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

proc/readproc.c: Harden fill_cgroup_cvt().

Browse Source 
Check the return value of snprintf(), otherwise dst may point
out-of-bounds when it reaches the end of the dst_buffer (the snprintf()
always returns 1 in that case, even if there is not enough space left),
and vMAX becomes negative and is passed to snprintf() as a size_t.
This commit is contained in:
Qualys Security Advisory 1970-01-01 00:00:00 +00:00 committed by Craig Small
parent 6939463606
commit 263c0ebdd8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
proc/readproc.c
View File

@ -821,7 +821,7 @@ static char** vectorize_this_str (const char* src) {
static void fill_cgroup_cvt (const char* directory, proc_t *restrict p) { static void fill_cgroup_cvt (const char* directory, proc_t *restrict p) {
#define vMAX ( MAX_BUFSZ - (int)(dst - dst_buffer) ) #define vMAX ( MAX_BUFSZ - (int)(dst - dst_buffer) )
char *src, *dst, *grp, *eob, *name; char *src, *dst, *grp, *eob, *name;
int tot, x, whackable_int = MAX_BUFSZ; int tot, x, whackable_int = MAX_BUFSZ, len;
*(dst = dst_buffer) = '\0'; // empty destination *(dst = dst_buffer) = '\0'; // empty destination
tot = read_unvectored(src_buffer, MAX_BUFSZ, directory, "cgroup", '\0'); tot = read_unvectored(src_buffer, MAX_BUFSZ, directory, "cgroup", '\0');
@ -833,7 +833,10 @@ static void fill_cgroup_cvt (const char* directory, proc_t *restrict p) {
#if 0 #if 0
grp += strspn(grp, "0123456789:"); // jump past group number grp += strspn(grp, "0123456789:"); // jump past group number
#endif #endif
dst += snprintf(dst, vMAX, "%s", (dst > dst_buffer) ? "," : ""); if (vMAX <= 1) break;
len = snprintf(dst, vMAX, "%s", (dst > dst_buffer) ? "," : "");
if (len < 0 || len >= vMAX) break;
dst += len;
dst += escape_str(dst, grp, vMAX, &whackable_int); dst += escape_str(dst, grp, vMAX, &whackable_int);
} }
p->cgroup = vectorize_this_str(dst_buffer[0] ? dst_buffer : "-"); p->cgroup = vectorize_this_str(dst_buffer[0] ? dst_buffer : "-");