tools lib traceevent: Handle dynamic array's element size properly
PATCH v2 1/1 tools lib traceevent: Handle dynamic array's element size properly
Fixing the dynamic array format field parsing.
Currently the event_read_fields function could segfault while parsing dynamic array other than string type. The reason is the event->pevent does not need to be set and gets dereferenced unconditionaly.
Also adding proper initialization of field->elementsize based on the parsed dynamic type.
--- tools/lib/traceevent/event-parse.c | 39 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-)
tools/lib/traceevent/event-parse.c +37 -2
@@ -1223,6 +1223,34 @@ static int field_is_long(struct format_field *field)return 0 ; } +static unsigned int type_size (char *name) +{ +/* This covers all FIELD_IS_STRING types. */ +static struct { +char *type; +unsigned int size; + } table[] = { + {"u8" ,1 }, + {"u16" ,2 }, + {"u32" ,4 }, + {"u64" ,8 }, + {"s8" ,1 }, + {"s16" ,2 }, + {"s32" ,4 }, + {"s64" ,8 }, + {"char" ,1 }, + { }, + }; +int i; + +for (i =0 ; table[i].type; i++) { +if (!strcmp (table[i].type, name)) +return table[i].size; + } + +return 0 ; +} +static int event_read_fields (struct event_format *event,struct format_field **fields) {struct format_field *field =NULL ;
@@ -1232,6 +1260,8 @@ static int event_read_fields(struct event_format *event, struct format_field **fint count =0 ; do { + unsigned int size_dynamic = 0; + type = read_token(&token); if (type == EVENT_NEWLINE) { free_token(token);
@@ -1390,6 +1420,7 @@ static int event_read_fields(struct event_format *event, struct format_field **f field->type = new_type;strcat (field->type," " );strcat (field->type, field->name); + size_dynamic =type_size (field->name);free_token (field->name);strcat (field->type, brackets); field->name = token;
@@ -1478,10 +1509,14 @@ static int event_read_fields(struct event_format *event, struct format_field **fif (field->flags &FIELD_IS_ARRAY ) {if (field->arraylen) field->elementsize = field->size / field->arraylen; +else if (field->flags &FIELD_IS_DYNAMIC ) + field->elementsize = size_dynamic;else if (field->flags &FIELD_IS_STRING ) field->elementsize =1 ; -else - field->elementsize = event->pevent->long_size; +else if (field->flags &FIELD_IS_LONG ) + field->elementsize = event->pevent ? + event->pevent->long_size : +sizeof (long ); }else field->elementsize = field->size;
Signature · 1 line
1.7.11.7
Quoted 27 lines · Jiri Olsa
Fixing the dynamic array format field parsing.
Currently the
event_read_fieldsfunction could segfault while parsing dynamic array other than string type. The reason is theevent->peventdoes not need to be set and gets dereferenced unconditionaly.Also adding proper initialization of
field->elementsizebased on the parsed dynamic type.Signed-off-by Jiri Olsa <[email protected]>Cc Arnaldo Carvalho de Melo <[email protected]>Cc Steven Rostedt <[email protected]>Cc Corey Ashford <[email protected]>Cc Frederic Weisbecker <[email protected]>Cc Ingo Molnar <[email protected]>Cc Namhyung Kim <[email protected]>Cc Paul Mackerras <[email protected]>Cc Peter Zijlstra <[email protected]>--- tools/lib/traceevent/event-parse.c | 39 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-)tools/lib/traceevent/event-parse.c +0
-0
tools/lib/traceevent/event-parse.c static int field_is_long(struct format_field *field) · line 1226
Quoted 4 lines
tools/lib/traceevent/event-parse.c +1
-0@@ -1223,6 +1223,34 @@ static int field_is_long(struct format_field *field)return 0 ; } +static unsigned int type_size (char *name)
Sorry to nitpick, but please make that const char *name.
Quoted 52 lines
tools/lib/traceevent/event-parse.c +31
-0+{ +/* This covers all FIELD_IS_STRING types. */ +static struct { +char *type; +unsigned int size; + } table[] = { + {"u8" ,1 }, + {"u16" ,2 }, + {"u32" ,4 }, + {"u64" ,8 }, + {"s8" ,1 }, + {"s16" ,2 }, + {"s32" ,4 }, + {"s64" ,8 }, + {"char" ,1 }, + { }, + }; +int i; + +for (i =0 ; table[i].type; i++) { +if (!strcmp (table[i].type, name)) +return table[i].size; + } + +return 0 ; +} +static int event_read_fields (struct event_format *event,struct format_field **fields) {struct format_field *field =NULL ;@@ -1232,6 +1260,8 @@ static int event_read_fields(struct event_format *event, struct format_field **fint count =0 ; do { + unsigned int size_dynamic = 0; + type = read_token(&token); if (type == EVENT_NEWLINE) { free_token(token);@@ -1390,6 +1420,7 @@ static int event_read_fields(struct event_format *event, struct format_field **f field->type = new_type;strcat (field->type," " );strcat (field->type, field->name); + size_dynamic =type_size (field->name);free_token (field->name);strcat (field->type, brackets); field->name = token;@@ -1478,10 +1509,14 @@ static int event_read_fields(struct event_format *event, struct format_field **fif (field->flags &FIELD_IS_ARRAY ) {if (field->arraylen) field->elementsize = field->size / field->arraylen; +else if (field->flags &FIELD_IS_DYNAMIC )
tools/lib/traceevent/event-parse.c static int event_read_fields(struct event_format *event, struct format_field **f · line 1520
Quoted 10 lines
tools/lib/traceevent/event-parse.c +5
-2+ field->elementsize = size_dynamic; else if (field->flags & FIELD_IS_STRING) field->elementsize = 1; -else - field->elementsize = event->pevent->long_size; + else if (field->flags & FIELD_IS_LONG) + field->elementsize = event->pevent ? + event->pevent->long_size : +sizeof (long ); }else
The rest looks good.
-- Steve
Quoted 2 lines
tools/lib/traceevent/event-parse.c +0
-0field->elementsize = field->size;
Em Thu, Jan 24, 2013 at 04:13:13PM -0500, Steven Rostedt escreveu:
Quoted 5 lines · Jiri Olsa
Quoted 2 lines
+static unsigned int
type_size(char *name)Sorry to nitpick, but please make that const char *name.
Agreed, no need to resubmit, I'll fix that up.
Quoted 1 line
The rest looks good.
Thanks, adding your Acked-by,
- Arnaldo
Quoted 8 lines · Arnaldo Carvalho de Melo
Em Thu, Jan 24, 2013 at 04:13:13PM -0500, Steven Rostedt escreveu:
Quoted 5 lines · Jiri Olsa
Quoted 2 lines
+static unsigned int
type_size(char *name)Sorry to nitpick, but please make that const char *name.
Agreed, no need to resubmit, I'll fix that up.
I'm sure Tom St Denis appreciates it.
Quoted 4 lines
Quoted 2 lines
The rest looks good.
Thanks, adding your Acked-by,
Sure. But I probably should test it too ;-)
-- Steve
Em Thu, Jan 24, 2013 at 04:33:05PM -0500, Steven Rostedt escreveu:
Quoted 10 lines · Arnaldo Carvalho de Melo
Quoted 8 lines
Em Thu, Jan 24, 2013 at 04:13:13PM -0500, Steven Rostedt escreveu:
Quoted 5 lines · Jiri Olsa
Quoted 2 lines
+static unsigned int
type_size(char *name)Sorry to nitpick, but please make that const char *name.
Agreed, no need to resubmit, I'll fix that up.
Quoted 8 lines
I'm sure Tom St Denis appreciates it.
Quoted 4 lines
Quoted 2 lines
The rest looks good.
Thanks, adding your Acked-by,
Sure. But I probably should test it too ;-)
ROFL
- Arnaldo
[tip:perf/core] tools lib traceevent: Handle dynamic array' s element size properly
In reply to Jiri OlsaCommit-ID: e23c1a5578cf32ed3a7ac9dde59a2de0a52ff812 Gitweb: http://git.kernel.org/tip/e23c1a5578cf32ed3a7ac9dde59a2de0a52ff812 Author: Jiri Olsa <[email protected]> AuthorDate: Thu, 24 Jan 2013 21:46:43 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 25 Jan 2013 12:49:28 -0300
tools lib traceevent: Handle dynamic array's element size properly
Fixing the dynamic array format field parsing.
Currently the event_read_fields function could segfault while parsing dynamic array other than string type. The reason is the event->pevent does not need to be set and gets dereferenced unconditionaly.
Also adding proper initialization of field->elementsize based on the parsed dynamic type.
--- tools/lib/traceevent/event-parse.c | 39 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-)
tools/lib/traceevent/event-parse.c +37 -2
@@ -1223,6 +1223,34 @@ static int field_is_long(struct format_field *field)return 0 ; } +static unsigned int type_size (const char *name) +{ +/* This covers all FIELD_IS_STRING types. */ +static struct { +const char *type; +unsigned int size; + } table[] = { + {"u8" ,1 }, + {"u16" ,2 }, + {"u32" ,4 }, + {"u64" ,8 }, + {"s8" ,1 }, + {"s16" ,2 }, + {"s32" ,4 }, + {"s64" ,8 }, + {"char" ,1 }, + { }, + }; +int i; + +for (i =0 ; table[i].type; i++) { +if (!strcmp (table[i].type, name)) +return table[i].size; + } + +return 0 ; +} +static int event_read_fields (struct event_format *event,struct format_field **fields) {struct format_field *field =NULL ;
@@ -1232,6 +1260,8 @@ static int event_read_fields(struct event_format *event, struct format_field **fint count =0 ; do { + unsigned int size_dynamic = 0; + type = read_token(&token); if (type == EVENT_NEWLINE) { free_token(token);
@@ -1390,6 +1420,7 @@ static int event_read_fields(struct event_format *event, struct format_field **f field->type = new_type;strcat (field->type," " );strcat (field->type, field->name); + size_dynamic =type_size (field->name);free_token (field->name);strcat (field->type, brackets); field->name = token;
@@ -1478,10 +1509,14 @@ static int event_read_fields(struct event_format *event, struct format_field **fif (field->flags &FIELD_IS_ARRAY ) {if (field->arraylen) field->elementsize = field->size / field->arraylen; +else if (field->flags &FIELD_IS_DYNAMIC ) + field->elementsize = size_dynamic;else if (field->flags &FIELD_IS_STRING ) field->elementsize =1 ; -else - field->elementsize = event->pevent->long_size; +else if (field->flags &FIELD_IS_LONG ) + field->elementsize = event->pevent ? + event->pevent->long_size : +sizeof (long ); }else field->elementsize = field->size;