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

0124-vmstat: Check return values of localtime() and strftime().

Browse Source 
Otherwise it leads to NULL-pointer dereferences (in case of localtime()
errors) and indeterminate contents of timebuf (in case of strftime()
errors).

Signed-off-by: Craig Small <csmall@enc.com.au>
This commit is contained in:
Qualys Security Advisory - committed by Craig Small
parent c7e17f4439
commit aca26df501
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vmstat.c
View File

@ -302,7 +302,7 @@ static void new_header(void)
if (t_option) { if (t_option) {
(void) time( &the_time ); (void) time( &the_time );
tm_ptr = localtime( &the_time ); tm_ptr = localtime( &the_time );
if (strftime(timebuf, sizeof(timebuf), "%Z", tm_ptr)) { if (tm_ptr && strftime(timebuf, sizeof(timebuf), "%Z", tm_ptr)) {
timebuf[strlen(timestamp_header) - 1] = '\0'; timebuf[strlen(timestamp_header) - 1] = '\0';
} else { } else {
timebuf[0] = '\0'; timebuf[0] = '\0';
@ -365,7 +365,11 @@ static void new_format(void)
if (t_option) { if (t_option) {
(void) time( &the_time ); (void) time( &the_time );
tm_ptr = localtime( &the_time ); tm_ptr = localtime( &the_time );
strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S", tm_ptr); if (tm_ptr && strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S", tm_ptr)) {
;
} else {
timebuf[0] = '\0';
}
} }
/* Do the initial fill */ /* Do the initial fill */
if (!(stat_stack = procps_stat_select(stat_info, First_stat_items, MAX_stat))) if (!(stat_stack = procps_stat_select(stat_info, First_stat_items, MAX_stat)))
@ -440,7 +444,11 @@ static void new_format(void)
if (t_option) { if (t_option) {
(void) time( &the_time ); (void) time( &the_time );
tm_ptr = localtime( &the_time ); tm_ptr = localtime( &the_time );
strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S", tm_ptr); if (tm_ptr && strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S", tm_ptr)) {
;
} else {
timebuf[0] = '\0';
}
} }
/* idle can run backwards for a moment -- kernel "feature" */ /* idle can run backwards for a moment -- kernel "feature" */
@ -608,7 +616,7 @@ static void diskheader(void)
if (t_option) { if (t_option) {
(void) time( &the_time ); (void) time( &the_time );
tm_ptr = localtime( &the_time ); tm_ptr = localtime( &the_time );
if (strftime(timebuf, sizeof(timebuf), "%Z", tm_ptr)) { if (tm_ptr && strftime(timebuf, sizeof(timebuf), "%Z", tm_ptr)) {
timebuf[strlen(timestamp_header) - 1] = '\0'; timebuf[strlen(timestamp_header) - 1] = '\0';
} else { } else {
timebuf[0] = '\0'; timebuf[0] = '\0';
@ -643,7 +651,11 @@ static void diskformat(void)
if (t_option) { if (t_option) {
(void) time( &the_time ); (void) time( &the_time );
tm_ptr = localtime( &the_time ); tm_ptr = localtime( &the_time );
strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S", tm_ptr); if (tm_ptr && strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S", tm_ptr)) {
;
} else {
timebuf[0] = '\0';
}
} }
for (j = 0; j < reap->total; j++) { for (j = 0; j < reap->total; j++) {
if (diskVAL(disk_TYPE, s_int) != DISKSTATS_TYPE_DISK) if (diskVAL(disk_TYPE, s_int) != DISKSTATS_TYPE_DISK)