Skip to contentSkip to conversation

trace-view: Handle unknown events more gracefully

PATCH In review Jan Kiszka 2 participants 3 messages Oct 14, 2010 – Nov 12, 2010

lore
Share & tools
lore

Jan Kiszka

author
#0 lore raw

PATCH 1/1 trace-view: Handle unknown events more gracefully

Kernel 2.6.35.7 generates invalid trace files due to /sys/kernel/debug/tracing/events/scsi/scsi_dispatch_cmd_timeout/format returning "FORMAT TOO BIG" (seems to be fixed in 2.6.36). This makes pevent_data_event_from_type return NULL, and dereferencing of event crashes the viewer.

Catch and report the error properly.

---
 trace-view-store.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
trace-view-store.c +6 -1
index 0834df7..34f8155 100644
@@ -507,12 +507,17 @@ trace_view_store_get_value (GtkTreeModel *tree_model,
 		case TRACE_VIEW_STORE_COL_INFO:
 			val = pevent_data_type(pevent, data);
 			event = pevent_data_event_from_type(pevent, val);
+			if (!event) {
+				if (column == TRACE_VIEW_STORE_COL_EVENT)
+					g_value_set_string(value, "[UNKNOWN EVENT]");
+				break;
+			}
+
 			if (column == TRACE_VIEW_STORE_COL_EVENT) {
 				g_value_set_string(value, event->name);
 				break;
 			}
 
-			
 			trace_seq_init(&s);
 			pevent_event_info(&s, event, data);
 			g_value_set_string(value, s.buffer);
Signature · 1 line
1.7.1
author
#1 lore raw
Quoted 7 lines · Jan Kiszka

Kernel 2.6.35.7 generates invalid trace files due to /sys/kernel/debug/tracing/events/scsi/scsi_dispatch_cmd_timeout/format returning "FORMAT TOO BIG" (seems to be fixed in 2.6.36). This makes pevent_data_event_from_type return NULL, and dereferencing of event crashes the viewer.

Catch and report the error properly.

Ping...

Jan

Quoted 29 lines
---
 trace-view-store.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
trace-view-store.c +6 -1
index 0834df7..34f8155 100644
@@ -507,12 +507,17 @@ trace_view_store_get_value (GtkTreeModel *tree_model,
 		case TRACE_VIEW_STORE_COL_INFO:
 			val = pevent_data_type(pevent, data);
 			event = pevent_data_event_from_type(pevent, val);
+			if (!event) {
+				if (column == TRACE_VIEW_STORE_COL_EVENT)
+					g_value_set_string(value, "[UNKNOWN EVENT]");
+				break;
+			}
+
 			if (column == TRACE_VIEW_STORE_COL_EVENT) {
 				g_value_set_string(value, event->name);
 				break;
 			}
 
-			
 			trace_seq_init(&s);
 			pevent_event_info(&s, event, data);
 			g_value_set_string(value, s.buffer);
#2 lore raw
Quoted 10 lines · Jan Kiszka
Quoted 7 lines · Jan Kiszka

Kernel 2.6.35.7 generates invalid trace files due to /sys/kernel/debug/tracing/events/scsi/scsi_dispatch_cmd_timeout/format returning "FORMAT TOO BIG" (seems to be fixed in 2.6.36). This makes pevent_data_event_from_type return NULL, and dereferencing of event crashes the viewer.

Catch and report the error properly.

Ping...

Thanks! I just had 3 conferences in the last month and that put me way behind in my email. I still have 1001 unread messages :-(

I'll pull this in today.

-- Steve