* [PATCH 0/3] trace-cmd: compile warning fixes
@ 2010-02-01 16:44 Darren Hart
2010-02-01 16:44 ` [PATCH 1/3] trace-cmd: Handle empty CPUs without crashing Darren Hart
0 siblings, 1 reply; 2+ messages in thread
From: Darren Hart @ 2010-02-01 16:44 UTC (permalink / raw)
To: linux-kernel; +Cc: rostedt
The following series fixes a few minor compiler warnings. These are
mostly printf format type issues. Also includes an uninitialized
variable fix.
--
Darren Hart
IBM Linux Technology Center
Real-Time Linux Team
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 1/3] trace-cmd: Handle empty CPUs without crashing
2010-02-01 16:44 [PATCH 0/3] trace-cmd: compile warning fixes Darren Hart
@ 2010-02-01 16:44 ` Darren Hart
0 siblings, 0 replies; 2+ messages in thread
From: Darren Hart @ 2010-02-01 16:44 UTC (permalink / raw)
To: linux-kernel; +Cc: rostedt, Steven Rostedt
From: Steven Rostedt <srostedt@redhat.com>
The get_page() needs to return -1 on reading a CPU that has no
data.
Also added checks of get_page() return status that was missing
from some callers.
Have tracecmd_set_cpu_to_timestamp() also return -1 when reading an
empty CPU.
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
trace-input.c | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/trace-input.c b/trace-input.c
index 0c7f9ad..69c2ce7 100644
--- a/trace-input.c
+++ b/trace-input.c
@@ -678,6 +678,10 @@ static int get_page(struct tracecmd_input *handle, int cpu,
handle->cpu_data[cpu].page)
return 1;
+ /* Do not map no data for CPU */
+ if (!handle->cpu_data[cpu].size)
+ return -1;
+
if (offset & (handle->page_size - 1)) {
errno = -EINVAL;
die("bad page offset %llx", offset);
@@ -941,7 +945,7 @@ int tracecmd_refresh_record(struct tracecmd_input *handle,
page_offset = record->offset & ~(handle->page_size - 1);
index = record->offset & (handle->page_size - 1);
- ret = get_page(handle, record->cpu, page_offset) < 0;
+ ret =get_page(handle, record->cpu, page_offset);
if (ret < 0)
return -1;
@@ -976,7 +980,9 @@ int tracecmd_refresh_record(struct tracecmd_input *handle,
struct record *
tracecmd_read_cpu_first(struct tracecmd_input *handle, int cpu)
{
- get_page(handle, cpu, handle->cpu_data[cpu].file_offset);
+ if (get_page(handle, cpu, handle->cpu_data[cpu].file_offset) < 0)
+ return NULL;
+
handle->cpu_data[cpu].index = 0;
if (handle->cpu_data[cpu].next) {
free_record(handle->cpu_data[cpu].next);
@@ -1009,7 +1015,8 @@ tracecmd_read_cpu_last(struct tracecmd_input *handle, int cpu)
else
offset -= handle->page_size;
- get_page(handle, cpu, offset);
+ if (get_page(handle, cpu, offset) < 0)
+ return NULL;
do {
free_record(record);
@@ -1048,6 +1055,9 @@ tracecmd_set_cpu_to_timestamp(struct tracecmd_input *handle, int cpu,
return -1;
}
+ if (!cpu_data->size)
+ return -1;
+
if (!cpu_data->page) {
if (init_cpu(handle, cpu))
return -1;
--
1.6.3.3
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-02-01 16:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-02-01 16:44 [PATCH 0/3] trace-cmd: compile warning fixes Darren Hart
2010-02-01 16:44 ` [PATCH 1/3] trace-cmd: Handle empty CPUs without crashing Darren Hart
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®