35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
|
From 306e6650221d88b29831bcdcef94447afb65df5c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Igor Zhbanov <i.zhbanov@samsung.com>
|
||
|
|
Date: Tue, 15 Oct 2013 14:35:13 +0400
|
||
|
|
Subject: [PATCH] Fix for SIGSEGV in systemd-bootchart on short-living
|
||
|
|
processes
|
||
|
|
|
||
|
|
The function svg_ps_bars() dereferencess NULL pointer in the line
|
||
|
|
endtime = ps->last->sampledata->sampletime;
|
||
|
|
because of partially initialized ps_struct (ps->last == NULL).
|
||
|
|
|
||
|
|
If some process terminates between scaning /proc directory in the log_sample()
|
||
|
|
function and reading additional information from /proc/PID/... files,
|
||
|
|
the files couldn't be read, the loop will be continued and partially
|
||
|
|
initialized structure returned.
|
||
|
|
---
|
||
|
|
src/bootchart/store.c | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git src/bootchart/store.c src/bootchart/store.c
|
||
|
|
index f8c97c2..7f86cfe 100644
|
||
|
|
--- src/bootchart/store.c
|
||
|
|
+++ src/bootchart/store.c
|
||
|
|
@@ -275,7 +275,7 @@ schedstat_next:
|
||
|
|
pscount++;
|
||
|
|
|
||
|
|
/* mark our first sample */
|
||
|
|
- ps->first = ps->sample;
|
||
|
|
+ ps->first = ps->last = ps->sample;
|
||
|
|
ps->sample->runtime = atoll(rt);
|
||
|
|
ps->sample->waittime = atoll(wt);
|
||
|
|
|
||
|
|
--
|
||
|
|
1.7.9.2
|
||
|
|
|