Home » Mailing list archives » linux-kernel » 2010 » May » 5

[PATCH] perf: Fix static strings treated like dynamic ones

Previous thread: Re: [PATCH 0/8] Suspend block api (version 6) by Alan Stern on Wednesday, May 5, 2010 - 1:04 pm. (6 messages)

Next thread: [PATCH linux-next] irq: Clear CPU mask in affinity_hint when none is provided by Peter P Waskiewicz Jr on Wednesday, May 5, 2010 - 1:56 pm. (2 messages)
[view original message]
From: Frederic Weisbecker
Subject: [PATCH] perf: Fix static strings treated like dynamic ones
Date: Wednesday, May 5, 2010 - 1:27 pm

The raw_field_ptr() helper, used to retrieve the address of a field
inside a trace event, treats every strings as if they were dynamic
ie: having a secondary level of indirection to retrieve their
contents.

FIELD_IS_STRING doesn't mean FIELD_IS_DYNAMIC, we only need to
compute the secondary dereference for the latter case.

This fixes perf sched segfaults, bad cmdline report and may be
some other bugs.

Reported-by: Jason Baron <jbaron@redhat.com>
Reported-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Tom Zanussi <tzanussi@gmail.com>
---
 tools/perf/util/trace-event-parse.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index 069f261..73a0222 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -1937,7 +1937,7 @@ void *raw_field_ptr(struct event *event, const char *name, void *data)
 	if (!field)
 		return NULL;
 
-	if (field->flags & FIELD_IS_STRING) {
+	if (field->flags & FIELD_IS_DYNAMIC) {
 		int offset;
 
 		offset = *(int *)(data + field->offset);
-- 
1.6.2.3

--


[ message continues ]
Previous thread: Re: [PATCH 0/8] Suspend block api (version 6) by Alan Stern on Wednesday, May 5, 2010 - 1:04 pm. (6 messages)

Next thread: [PATCH linux-next] irq: Clear CPU mask in affinity_hint when none is provided by Peter P Waskiewicz Jr on Wednesday, May 5, 2010 - 1:56 pm. (2 messages)