Messages in this thread Patch in this message | | | Date | Wed, 22 Apr 2009 01:32:54 +0200 | From | Frederic Weisbecker <> | Subject | [PATCH][GIT-PULL] tracing/events: protect __get_str() |
| |
On Tue, Apr 21, 2009 at 06:21:54PM -0400, Steven Rostedt wrote: > It would probably be better to just make the fix now. Just put the fix in > a separate branch to avoid race conditions (if Ingo already did a pull ;-) > > -- Steve
Ok, so this new pull request includes the patches in the previous request + your Reviewed/Acked-by + the fix on __get_str() which I pasted below. It's also a rebase against latest tip/tracing/core.
Thanks.
The following changes since commit 3554228d4289098a8fe5cfd87512ec32a19bbe5a: Steven Rostedt (1): ring-buffer: only warn on wrap if buffer is bigger than two pages
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git tracing/core-v2
Frederic Weisbecker (3): tracing/events: provide string with undefined size support tracing/lock: provide lock_acquired event support for dynamic size string tracing/events: protect __get_str()
include/trace/events/lockdep.h | 6 +- include/trace/ftrace.h | 88 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 88 insertions(+), 6 deletions(-) --- From 94be8f865ac6887e79cd38302d707f5536e377fe Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker <fweisbec@gmail.com> Date: Wed, 22 Apr 2009 00:41:09 +0200 Subject: [PATCH] tracing/events: protect __get_str()
The __get_str() macro is used in a code part then its content should be protected with parenthesis.
[ Impact: protect macro content ]
Reported-by: Steven Rostedt <rostedt@goodmis.org> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> --- include/trace/ftrace.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h index 353b7db..019cc5d 100644 --- a/include/trace/ftrace.h +++ b/include/trace/ftrace.h @@ -123,7 +123,7 @@ #define TP_printk(fmt, args...) fmt "\n", args #undef __get_str -#define __get_str(field) (char *)__entry + __entry->__str_loc_##field +#define __get_str(field) ((char *)__entry + __entry->__str_loc_##field) #undef TRACE_EVENT #define TRACE_EVENT(call, proto, args, tstruct, assign, print) \ -- 1.6.2.3
| |