linux-kernel - [PATCH][GIT PULL][v2.6.32] tracing: Fix event format export

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1258171964.22249.234.camel@gandalf.stny.rr.com>
Date:	Fri, 13 Nov 2009 23:12:44 -0500
From:	Steven Rostedt <rostedt@...dmis.org>
To:	Ingo Molnar <mingo@...e.hu>
Cc:	Johannes Berg <johannes@...solutions.net>,
	Frederic Weisbecker <fweisbec@...il.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	LKML <linux-kernel@...r.kernel.org>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: [PATCH][GIT PULL][v2.6.32] tracing: Fix event format export


Ingo,

Please pull the latest tip/tracing/urgent tree, which can be found at:

  git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/urgent


Johannes Berg (1):
      tracing: Fix event format export

----
 include/trace/ftrace.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---------------------------
commit 811cb50baf63461ce0bdb234927046131fc7fa8b
Author: Johannes Berg <johannes@...solutions.net>
Date:   Fri Nov 13 23:40:09 2009 +0100

    tracing: Fix event format export
    
    For some reason the export of the event print format to userspace
    uses '#fmt' which breaks if the format string is anything but a plain
    string, for example if it is built with macros then the macro names
    are exported instead of their contents.
    
    Use
    	"\"%s\"", fmt
    instead of
    	"%s", #fmt
    to export the string and not the way it is built.
    
    For example, in net/mac80211/driver-trace.h for the trace event drv_start
    there is:
    
            TP_printk(
                    LOCAL_PR_FMT, LOCAL_PR_ARG
            )
    
    Which use to produce:
    
     print fmt: LOCAL_PR_FMT, REC->wiphy_name
    
    Now produces:
    
     print fmt: "%s", REC->wiphy_name
    
    Signed-off-by: Johannes Berg <johannes@...solutions.net>
    LKML-Reference: <20091113224009.GB23942@...e.hu>
    Signed-off-by: Steven Rostedt <rostedt@...dmis.org>

diff --git a/include/trace/ftrace.h b/include/trace/ftrace.h
index cc0d966..dacb8ef 100644
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h
@@ -159,7 +159,7 @@
 #undef __get_str
 
 #undef TP_printk
-#define TP_printk(fmt, args...) "%s, %s\n", #fmt, __stringify(args)
+#define TP_printk(fmt, args...) "\"%s\", %s\n", fmt, __stringify(args)
 
 #undef TP_fast_assign
 #define TP_fast_assign(args...) args


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/