Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 17 Jan 2018 08:28:08 -0800
From:   tip-bot for Michael Sartain <tipbot@zytor.com>
Message-ID: <tip-952a99ccfa9db2f9a32810fc9c0084f532dd871a@git.kernel.org>
Cc:     hpa@zytor.com, tglx@linutronix.de, akpm@linux-foundation.org,
        mingo@kernel.org, namhyung@kernel.org, mikesart@fastmail.com,
        acme@redhat.com, rostedt@goodmis.org, linux-kernel@vger.kernel.org
Reply-To: linux-kernel@vger.kernel.org, acme@redhat.com,
          rostedt@goodmis.org, mikesart@fastmail.com, namhyung@kernel.org,
          mingo@kernel.org, akpm@linux-foundation.org, tglx@linutronix.de,
          hpa@zytor.com
In-Reply-To: <d320000d37c10ce0912851e1fb78d1e0c946bcd9.1497486273.git.mikesart@fastmail.com>
References: <20180112004821.827168881@goodmis.org>
        <d320000d37c10ce0912851e1fb78d1e0c946bcd9.1497486273.git.mikesart@fastmail.com>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:perf/core] tools lib traceevent: Fix bad force_token escape
 sequence
Git-Commit-ID: 952a99ccfa9db2f9a32810fc9c0084f532dd871a
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  952a99ccfa9db2f9a32810fc9c0084f532dd871a
Gitweb:     https://git.kernel.org/tip/952a99ccfa9db2f9a32810fc9c0084f532dd871a
Author:     Michael Sartain <mikesart@fastmail.com>
AuthorDate: Thu, 11 Jan 2018 19:47:42 -0500
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 17 Jan 2018 10:21:39 -0300

tools lib traceevent: Fix bad force_token escape sequence

Older kernels have a bug that creates invalid symbols. event-parse.c
handles them by replacing them with a "%s" token. But the fix included
an extra backslash, and "\%s" was added incorrectly.

Signed-off-by: Michael Sartain <mikesart@fastmail.com>
Acked-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Link: http://lkml.kernel.org/r/20180112004821.827168881@goodmis.org
Link: http://lkml.kernel.org/r/d320000d37c10ce0912851e1fb78d1e0c946bcd9.1497486273.git.mikesart@fastmail.com
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/lib/traceevent/event-parse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 7ce724f..0bc1a6d 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -1094,7 +1094,7 @@ static enum event_type __read_token(char **tok)
 		if (strcmp(*tok, "LOCAL_PR_FMT") == 0) {
 			free(*tok);
 			*tok = NULL;
-			return force_token("\"\%s\" ", tok);
+			return force_token("\"%s\" ", tok);
 		} else if (strcmp(*tok, "STA_PR_FMT") == 0) {
 			free(*tok);
 			*tok = NULL;